Commit da3dbfdd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android13-5.15 into android13-5.15-lts



This merges the android13-5.15 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 6030c6cd Merge tag 'android13-5.15.189_r00' into android13-5.15
* d16b19ea FROMGIT: f2fs: prevent atomic file from being dirtied before commit
* ba953bf0 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* 39548fae BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* 41a98a8c ANDROID: 16K: Allocate pad vma on the stack
* 168c322c ANDROID: 16K: Don't copy data vma for maps/smaps output
* 7801f8b2 ANDROID: Update abi_gki_aarch64_pointmobile symbol list
* a4cd3974 ANDROID: GKI: Update oplus symbol list
* a598e51e ANDROID: vendor_hooks: add hooks in cpu_cgroup subsystem
* 5b09ae98 ANDROID: vendor_hooks: Add hooks in reweight_entity
* 33d779ad ANDROID: GKI: Export css_task_iter_start()
* 97b631bf ANDROID: bpf: do not fail to load if log is full
* 7c3c383c BACKPORT: Add support for PIO p flag
* 532cc549 ANDROID: GKI: explicit include of stringify.h

Change-Id: Ie9f15406c8dad770f3fd63e0f96a7b446e96b6f7
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f32b5253 6030c6cd
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment