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

Merge branch 'android14-6.1' into branch 'android14-6.1-lts'



Sync up the android14-6.1-lts branch with recent android14-6.1 changes.
This includes the following commits:

* 74c507aa UPSTREAM: USB: gadget: core: create sysfs link between udc and gadget
* 92704e00 ANDROID: GKI: add tegra20-cpufreq.ko to rockpi4 build
* 84987005 ANDROID: GKI: update symbol list for db845c
* 1e4532a4 ANDROID: Build some tegra configs as vendor module
* 974a6f43 ANDROID: gki_defconfig: Enable Tegra SoCs
* 6b75fd48 ANDROID: Update the ABI symbol list
* c6427490 Revert^2 "BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST ..."
* 87a4e677 Merge tag 'android14-6.1.78_r00' into branch android14-6.1
* a6358098 ANDROID: binder: fix KMI-break due to alloc->lock
* 1c5fb0eb ANDROID: binder: fix ptrdiff_t printk-format issue
* d30de4c7 ANDROID: binder: fix KMI-break due to address type change
* 81054a45 Reapply "ANDROID: vendor_hooks: Add hook for binder_detect_low_async_space"
* 7e855d14 Reapply "ANDROID: Add vendor hooks for binder perf tuning"
* a091f970 UPSTREAM: binder: switch alloc->mutex to spinlock_t
* a4abaacd UPSTREAM: binder: reverse locking order in shrinker callback
* 112ca28d UPSTREAM: binder: avoid user addresses in debug logs
* 0402339e UPSTREAM: binder: refactor binder_delete_free_buffer()
* aacaa36e UPSTREAM: binder: collapse print_binder_buffer() into caller
* baef4637 UPSTREAM: binder: document the final page calculation
* 19d966c1 BACKPORT: UPSTREAM: binder: rename lru shrinker utilities
* aac2b2c7 UPSTREAM: binder: make oversized buffer code more readable
* de86cd1e UPSTREAM: binder: remove redundant debug log
* 78dfa695 UPSTREAM: binder: perform page installation outside of locks
* 2b6af2f3 UPSTREAM: binder: initialize lru pages in mmap callback
* 48554214 UPSTREAM: binder: malloc new_buffer outside of locks
* 796a1cae UPSTREAM: binder: refactor page range allocation
* 568a63be UPSTREAM: binder: relocate binder_alloc_clear_buf()
* e4ee73a6 UPSTREAM: binder: relocate low space calculation
* 919daae2 UPSTREAM: binder: separate the no-space debugging logic
* a37caf8d UPSTREAM: binder: remove pid param in binder_alloc_new_buf()
* a880c450 UPSTREAM: binder: do unlocked work in binder_alloc_new_buf()
* e5fae62f UPSTREAM: binder: split up binder_update_page_range()
* b66dacff UPSTREAM: binder: keep vma addresses type as unsigned long
* 8b2c4f7a UPSTREAM: binder: remove extern from function prototypes
* 6a29f5fb Revert "ANDROID: Add vendor hooks for binder perf tuning"
* 9e2c184d Revert "ANDROID: vendor_hooks: Add hook for binder_detect_low_async_space_locked"
* 6c17e786 Revert "ANDROID: vendor_hook: rename the the name of hooks"
* dd875b63 ANDROID: GKI: Update rockchip symbols for some usb wifi bt.
* d3c340f9 UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* e302f3a2 ANDROID: incremental-fs: Make work with 16k pages
* 3f139724 Revert "BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST ..."
* 29f2af3c BACKPORT: FROMGIT: module: allow UNUSED_KSYMS_WHITELIST to be relative against objtree.
* 6820762b FROMLIST: kheaders: explicitly define file modes for archived headers
* 47a00e59 ANDROID: pahole -J -j1 for reproducible BTF
* 68c82178 UPSTREAM: epoll: be better about file lifetimes
* 84574a4e FROMLIST: usb: typec: tcpm: Ignore received Hard Reset in TOGGLING state
* 2755f25d UPSTREAM: usb: gadget: ncm: Fix handling of zero block length packets

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