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

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



Backmerge the latest android14-6.1 changes into the lts branch to keep
up to date.  Contains the following commits:

* 3578913b UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl
* 8fbed1ea UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* 6ce5bb74 ANDROID: GKI: Update symbol list for mtk
* 7cbad588 Reapply "perf: Disallow mis-matched inherited group reads"
* 067a03c4 ANDROID: GKI: Add Pasa symbol list
* b6be1a36 FROMGIT: mm: memcg: don't periodically flush stats when memcg is disabled
* d0e2d333 ANDROID: Update the ABI symbol list
* 10558542 ANDROID: sched: export update_misfit_status symbol
* a0b3b398 ANDROID: GKI: Add ASR KMI symbol list
* 599710db FROMGIT: usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
* 9265fa90 FROMLIST: usb: core: Prevent null pointer dereference in update_port_device_state
* 2730733d ANDROID: gki_defconfig: Enable CONFIG_NVME_MULTIPATH
* 4f668f56 BACKPORT: irqchip/gic-v3: Work around affinity issues on ASR8601
* 473a8713 BACKPORT: irqchip/gic-v3: Improve affinity helper
* 6c32acf5 UPSTREAM: sched/fair: Limit sched slice duration
* 7088d250 ANDROID: Update the ABI symbol list
* c2497404 ANDROID: idle_inject: Export function symbols
* 990d3414 ANDROID: Update the ABI symbol list
* be92a6a1 ANDROID: GKI: Remove CONFIG_MEDIA_CEC_RC
* fa9ac43f BACKPORT: usb: host: xhci: Avoid XHCI resume delay if SSUSB device is not present
*   f27fc6ba Merge "Merge tag 'android14-6.1.68_r00' into branch 'android14-6.1'" into android14-6.1
|\
| * 0177cfb2 Merge tag 'android14-6.1.68_r00' into branch 'android14-6.1'
* c96cea1a ANDROID: Update the ABI symbol list
* c2fbc121 ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic
* 90bd30bd ANDROID: Update the ABI symbol list
* 32805608 ANDROID: Update the ABI symbol list
* 427210e4 UPSTREAM: usb: gadget: uvc: Remove nested locking
* 9267e267 ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value
* 2d3f0c9d ANDROID: Roll back some code to fix system_server registers psi trigger failed.
* bd77c97c UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
* 21c71a7d ANDROID: GKI: Add symbol list for Nothing
* aba5a3fe ANDROID: Enable CONFIG_LAZY_RCU in x86 gki_defconfig
* 20416039 ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
* 947708f1 ANDROID: ABI: Update symbol list for imx
* 7eedea7a BACKPORT: PM: sleep: Fix possible deadlocks in core system-wide PM code
* e1a20dd9 UPSTREAM: async: Introduce async_schedule_dev_nocall()
* e4b0e14f UPSTREAM: async: Split async_schedule_node_domain()
* 6b4c816d FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields
* d97ea652 ANDROID: Enable CONFIG_LAZY_RCU in arm64 gki_defconfig
* 90d68ced FROMLIST: rcu: Provide a boot time parameter to control lazy RCU
* a079cc58 ANDROID: rcu: Add a minimum time for marking boot as completed
* ffe09c06 UPSTREAM: rcu: Disable laziness if lazy-tracking says so
* d07488d2 UPSTREAM: rcu: Track laziness during boot and suspend
* 4316bd56 UPSTREAM: net: Use call_rcu_hurry() for dst_release()
* b9427245 UPSTREAM: workqueue: Make queue_rcu_work() use call_rcu_hurry()
* 72fdf7f6 UPSTREAM: percpu-refcount: Use call_rcu_hurry() for atomic switch
* ced65a05 UPSTREAM: io_uring: use call_rcu_hurry if signaling an eventfd
* 84c8157d UPSTREAM: rcu: Update synchronize_rcu_mult() comment for call_rcu_hurry()
* 3751416e UPSTREAM: scsi/scsi_error: Use call_rcu_hurry() instead of call_rcu()
* 52193e94 UPSTREAM: rcu/rcutorture: Use call_rcu_hurry() where needed
* 83f8ba56 UPSTREAM: rcu/rcuscale: Use call_rcu_hurry() for async reader test
* 9b625f49 UPSTREAM: rcu/sync: Use call_rcu_hurry() instead of call_rcu
* c570c8fe BACKPORT: rcu: Shrinker for lazy rcu
* 49575794 UPSTREAM: rcu: Refactor code a bit in rcu_nocb_do_flush_bypass()
* 66a832fe UPSTREAM: rcu: Make call_rcu() lazy to save power
* 4fb09fb4 UPSTREAM: rcu: Fix missing nocb gp wake on rcu_barrier()
* 64c59ad2 UPSTREAM: rcu: Fix late wakeup when flush of bypass cblist happens
* 0799ace2 ANDROID: Update the ABI symbol list
* 65db2f8e ANDROID: GKI: add GKI symbol list for Exynosauto SoC
* cfe8cce4 UPSTREAM: coresight: tmc: Don't enable TMC when it's not ready.
* 899194d7 UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions
* e6712ed4 ANDROID: ABI: Update oplus symbol list
* 24bb8fc8 ANDROID: vendor_hooks: add hooks in driver/android/binder.c
* 55930b39 ANDROID: GKI: Update honda symbol list for xt_LOG
* 3160b69e ANDROID: GKI: Update honda symbol list for ebt filter
* 4dc7f988 ANDROID: GKI: Update honda symbol list for ebtables
* 39a08233 ANDROID: GKI: Update honda symbol list for net scheduler
* dd0098bd ANDROID: GKI: Update honda symbol list for led-trigger
* 66a20ed4 ANDROID: GKI: Add initial symbol list for honda
* 28dbe4d6 ANDROID: GKI: add symbols to ABI
* 97100e86 FROMGIT: usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
* 36248a15 FROMGIT: usb: dwc3: set pm runtime active before resume common

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