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

Merge branch 'android12-5.10' into android12-5.10-lts



Merge the changes in the non-lts branch into the lts branch to keep it
up to date.  Changes in here include:

* 9b6fc2bc UPSTREAM: dma-buf: heaps: Fix off-by-one in CMA heap fault handler
* b9d4c135 Merge tag 'android12-5.10.226_r00' into android12-5.10
* 1ef76128 BACKPORT: firmware: arm_scmi: Queue in scmi layer for mailbox implementation
* 53a61c62 BACKPORT: gso: fix udp gso fraglist segmentation after pull from frag_list
* f22586e7 ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode
* 51b9e859 UPSTREAM: unicode: Don't special case ignorable code points
* 66aebe42 ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* 0e3d191e ANDROID: 16K: Introduce pgsize_migration_inline.h
* 4c7b897f BACKPORT: netem: fix return value if duplicate enqueue fails
* 7b9f6a0e ANDROID: GKI: Update the ABI symbol list
* 6b967696 ANDROID: GKI: Update symbol list for vivo
* ac8da910 ANDROID: GKI: export sys_exit tracepoint
* f3eef39b ANDROID: GKI: Update symbol list for vivo
* 2205d34f ANDROID: GKI: Update symbol list for vivo
* 88841662 ANDROID: GKI: add percpu_rwsem vendor hooks
* 2521fb1d ANDROID: vendor_hooks: add hooks in rwsem
* 5b9bc4b1 ANDROID: delete tool added by mistake
* 0c025265 ANDROID: GKI: Add initialization for rwsem's oem_data and vendor_data.
* 2c00661c ANDROID: GKI: Add initialization for mutex oem_data.
* 8e78d8ae ANDROID: fix ENOMEM check of binder_proc_ext
* 587d04a0 ANDROID: binder: fix KMI issues due to frozen notification
* 69d87eed BACKPORT: FROMGIT: binder: frozen notification binder_features flag
* 0e10c656 BACKPORT: FROMGIT: binder: frozen notification
* 014a9ca1 UPSTREAM: selftests/binderfs: add test for feature files
* fe8ef2d5 UPSTREAM: docs: binderfs: add section about feature files
* 433a83ab UPSTREAM: binderfs: add support for feature files
* d7881f1c ANDROID: GKI: Add symbol to symbol list for vivo.
* 284a6a93 ANDROID: vendor_hooks: add hooks to modify pageflags
* a5d073d6 ANDROID: GKI: Add pageflags for OEM
* c7d7f847 ANDROID: GKI: Update symbol list for vivo
* 89d09e01 ANDROID: vendor_hooks: add vendor hooks for fuse request
* 9ac177ec UPSTREAM: net: sched: sch_multiq: fix possible OOB write in multiq_tune()

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