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

Merge android12-5.10 into android12-5.10-lts



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

It contains the following commits:

* 29e5b309 Merge tag 'android12-5.10.240_r00' into android12-5.10
* f75a674c BACKPORT: FROMGIT: f2fs: add sysfs entry for effective lookup mode
* 34d1a222 BACKPORT: FROMGIT: f2fs: add lookup_mode mount option
* 1ee9b67d ANDROID: 16K: Allocate pad vma on the stack
* 881ba9d9 ANDROID: 16K: Don't copy data vma for maps/smaps output
* f405d5f9 ANDROID: GKI: Update oplus symbol list
* 01179fa8 ANDROID: vendor_hooks: add hooks in cpu_cgroup subsystem
* ba270f8f ANDROID: vendor_hooks: Add hooks in reweight_entity
* cbcbb470 ANDROID: GKI: Export css_task_iter_start()
* 55f3f181 UPSTREAM: regulator: core: Fix deadlock in create_regulator()
* be7fc88d UPSTREAM: coresight-etm4x: add isb() before reading the TRCSTATR
* e386309e UPSTREAM: usb: gadget: f_uac2: Fix incorrect setting of bNumEndpoints
* e715fae5 UPSTREAM: f2fs: fix to avoid use GC_AT when setting gc_mode as GC_URGENT_LOW or GC_URGENT_MID
* a6fd2c69 UPSTREAM: usb: typec: fix unreleased fwnode_handle in typec_port_register_altmodes()
* bc215352 UPSTREAM: xhci: Mitigate failed set dequeue pointer commands
* 270f4894 ANDROID: refresh ABI following type change
* beaad7f4 UPSTREAM: net/sched: Always pass notifications when child class becomes empty
* 534bbffa ANDROID: bpf: do not fail to load if log is full
* 8d1ac3f3 BACKPORT: Add support for PIO p flag

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