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

Merge android13-5.10 into android13-5.10-lts



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

It contains the following commits:

* f4e70a54 Merge tag 'android13-5.10.240_r00' into android13-5.10
* 456275f3 BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* 83128575 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* fc9200a9 ANDROID: 16K: Allocate pad vma on the stack
* b5a6f8ba ANDROID: 16K: Don't copy data vma for maps/smaps output
* 17aaf293 ANDROID: vendor_hooks: Add hooks in reweight_entity
* c81aec91 ANDROID: GKI: Export css_task_iter_start()
* 69b33e62 UPSTREAM: net/sched: Always pass notifications when child class becomes empty

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