Merge android12-5.4 into android12-5.4-lts
This merges the android12-5.4 branch into the -lts branch, catching it up with the latest changes in there. It contains the following commits: * 14b655c6 Merge tag 'android12-5.4.294_r00' into android12-5.4 * 534701f9 FROMGIT: f2fs: sysfs: export linear_lookup in features directory * 3f821478 FROMGIT: f2fs: sysfs: add encoding_flags entry * 283d568b FROMGIT: f2fs: support to disable linear lookup fallback * de3036f0 BACKPORT: binder: Create safe versions of binder log files * 12ba7833 UPSTREAM: binder: Refactor binder_node print synchronization Change-Id: Icbc66b57f2433b77f10df316eae7c7d3b69aa1e9 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment