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

Merge branch 'android13-5.15' into branch 'android13-5.15-lts'



This catches the android13-5.15-lts branch up with recent changes in
android13-5.15, including some ABI symbols that need to be properly
tracked.

Included in here are the following commits:

* 07a62889 ANDROID: GKI: Update symbol list for mtk
* 6cc1dacf ANDROID: usb: Optimize the problem of slow transfer rate in USB accessory mode
* edafa7e5 ANDROID: GKI: Add symbol list for exynosauto
* 2b1828f3 FROMGIT: usb: dwc3: Wait unconditionally after issuing EndXfer command
* b1a7a4c4 ANDROID: GKI: Update symbol list for vivo
* 252025c8 ANDROID: vendor_hooks: add hooks for exting task's swp_entrys
* b2e6f8e1 ANDROID: ABI: Update honor symbol list
* 8f68ff0b ANDROID: add vendor hook in do_read_fault to tune fault_around_bytes
* 0eccf4c0 ANDROID: 16K: Fix show maps CFI failure
* 9e5fc85b ANDROID: 16K: Handle pad VMA splits and merges
* 0c5b08de ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 836c41d3 ANDROID: 16K: Only madvise padding from dynamic linker context
* 6b0dc451 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* b45b2c51 ANDROID: 16K: Exclude ELF padding for fault around range
* 8629cff1 ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* e62af1bd ANDROID: 16K: Introduce ELF padding representation for VMAs
* 40a6ca0d ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* 5f1f7854 ANDROID: Add symbol list for ARCVM
* 804531ae ANDROID: Add CONFIG_NET_9P
* 1d6838aa ANDROID: Enable CONFIG_LAZY_RCU in x86 gki_defconfig
* 11c8ba33 ANDROID: Enable CONFIG_LAZY_RCU in arm64 gki_defconfig
* b657edec FROMLIST: rcu: Provide a boot time parameter to control lazy RCU
* a2984285 ANDROID: rcu: Add a minimum time for marking boot as completed
* c4e857da UPSTREAM: rcu/kvfree: Move need_offload_krc() out of krcp->lock
* b9f7b61a UPSTREAM: rcu/kfree: Fix kfree_rcu_shrink_count() return value
* d13996c4 UPSTREAM: rcu/kvfree: Update KFREE_DRAIN_JIFFIES interval
* 8309b1d6 UPSTREAM: rcu/kvfree: Remove useless monitor_todo flag
* 96b2f1a1 UPSTREAM: scsi/scsi_error: Use call_rcu_hurry() instead of call_rcu()
* 145e58eb ANDROID: rxrpc: Use call_rcu_hurry() instead of call_rcu()
* 0f3566bf UPSTREAM: net: devinet: Reduce refcount before grace period
* 3b7f9eb6 UPSTREAM: rcu: Disable laziness if lazy-tracking says so
* b93701c7 UPSTREAM: rcu: Track laziness during boot and suspend
* ee7f3754 UPSTREAM: net: Use call_rcu_hurry() for dst_release()
* 16944215 UPSTREAM: percpu-refcount: Use call_rcu_hurry() for atomic switch
* a8407542 UPSTREAM: rcu/sync: Use call_rcu_hurry() instead of call_rcu
* 7297afa4 UPSTREAM: rcu: Refactor code a bit in rcu_nocb_do_flush_bypass()
* 107b3bf6 BACKPORT: rcu: Shrinker for lazy rcu
* cca23ea6 BACKPORT: rcu: Make call_rcu() lazy to save power
* 2fa81068 UPSTREAM: rcu: Fix late wakeup when flush of bypass cblist happens
* b12f387c BACKPORT: rcu: Fix missing nocb gp wake on rcu_barrier()
* 415bf493 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 82234d01 UPSTREAM: netfilter: nft_set_pipapo: do not free live element
* 897b4b44 UPSTREAM: af_unix: Fix garbage collector racing against connect()
* eb5cd3fd UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* f58e0ae2 ANDROID: GKI: Update symbols to symbol list
* 73d5698b ANDROID: vendor_hook: Add hooks to support reader optimistic spin in rwsem
* 9e6a1299 UPSTREAM: usb: gadget: f_ncm: Fix UAF ncm object at re-bind after usb ep transport error
* f9f189de ANDROID: GKI: Update symbols to symbol list
* 78a68f42 ANDROID: GKI: update symbol list file for xiaomi
* 07c8a078 ANDROID: ABI: Update oplus symbol list
* 63070883 ANDROID: mm: fix incorrect unlock mmap_lock for speculative swap fault
* 443bd6f9 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* c25b967b UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* bc808fbf UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout

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