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

Merge android14-5.15 into android14-5.15-lts



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

It contains the following commits:

* 19882ba6 Merge tag 'android14-5.15.189_r00' into android14-5.15
* f113b370 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* 8fcf7a12 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* 00510ce0 ANDROID: 16K: Allocate pad vma on the stack
* 4ef7f2bc ANDROID: 16K: Don't copy data vma for maps/smaps output
* 219f62e8 ANDROID: GKI: Update RTK STB KMI symbol list
* 969224bb ANDROID: bpf: do not fail to load if log is full

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