tree ac8e29fea071783409a073a57bc0c34e3c4a7587
parent 3802b45594e1e000cdf46d1ae48b07783a276418
parent da7a14893e185b2376cc54ca2566b1ae96b6b6b3
author Greg Kroah-Hartman <gregkh@google.com> 1707921425 +0000
committer Greg Kroah-Hartman <gregkh@google.com> 1707921481 +0000

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

Catch the LTS branch up with the changed done on the normal one.  This
includes a number of abi updates.  Included in here are the following
commits:

* da7a14893e18 ANDROID: introduce a vendor hook to allow speculative swap pagefaults
* a20b68c39612 ANDROID: mm: allow limited speculative page faulting in do_swap_page()
* d268789e5474 UPSTREAM: Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"
* e2495751d679 UPSTREAM: Revert "drm/bridge: lt9611uxc: Register and attach our DSI device at probe"
* 9b9ea9df85b8 UPSTREAM: Revert "drm/bridge: lt9611uxc: fix the race in the error path"
* 2b2398f1d9c2 ANDROID: Add vendor hooks for FUSE tmpfile support
* 54211d65116e ANDROID: ABI: Add to QCOM symbols list
* e3869233dbca UPSTREAM: net: tls, update curr on splice as well
* 19086c5b7970 ANDROID: GKI: abi_gki_aarch64_qcom: QCOM symbols list update
* 69b5aea2588d ANDROID: GKI: db845c: Update symbols list and ABI on devm MIPI-DSI helpers
* 7898ff4e1d2f ANDROID: GKI: abi_gki_aarch64_qcom: Add to QCOM symbols list
* 569b4d61aac3 UPSTREAM: netfilter: nf_tables: check if catch-all set element is active in next generation
* 3e89c479a14b Reapply "perf: Fix perf_event_validate_size()"
* 4e373a8779df UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* d785e92e38e1 UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl
* a3135def8ef3 UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
*   21e3d987d5d4 Merge "Merge tag 'android13-5.15.144_r00' into branch 'android13-5.15'" into android13-5.15
|\
| * f48ea9fc7c5e Merge tag 'android13-5.15.144_r00' into branch 'android13-5.15'
* | cdd966438b48 ANDROID: ABI break fix caused by kernfs_root and kernfs_elem_dir size increase
* | d09f68864a5c UPSTREAM: kernfs: fix NULL dereferencing in kernfs_remove
* | dd12fb6b6ce2 UPSTREAM: kernfs: prevent early freeing of root node
* | f2242c11be4d UPSTREAM: kernfs: switch global kernfs_rwsem lock to per-fs lock
|/
* 14657378ebc7 Reapply "perf: Disallow mis-matched inherited group reads"
* 10d404c1deb3 FROMGIT: usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
* 57d3b677d801 UPSTREAM: extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP
* 18a7c3160111 FROMGIT: usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
* 13191555da7e FROMGIT: usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
* 62865d5e3527 ANDROID: mm: Fix VMA ref count after fast-mremap
* f36e566c5a45 ANDROID: GKI: Update abi_gki_aarch64_pasa
* 767035bbf482 ANDROID: gki_defconfig: enable CONFIG_ARM_SCMI_TRANSPORT_VIRTIO
* 83aff341a439 UPSTREAM: workqueue: Warn when a new worker could not be created
* 9479bc12b44f ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic
* 9e4c80515be8 ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value
* d8fc90f747c1 UPSTREAM: usb: gadget: uvc: Remove nested locking
* 96199e504451 UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
* 204618e4c0d1 ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
* b4a8ca46426c ANDROID: GKI: Update symbols to symbol list
* 2d0ed0503d13 FROMGIT: usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
* 8497153755ac FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields
* 2ac1467c0ae0 ANDROID: vendor_hooks: fix ABI following __set_task_comm vendor hook
* ea1af4a49a2e FROMGIT: usb: dwc3: core: set force_gen1 bit in USB31 devices if max speed is SS
* d4919ef79797 ANDROID: fs/fuse: Use extended init flags for FUSE_PASSTHROUGH
* 1a6f3febffee UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions
* 739ec4a4b6ea ANDROID: ABI: Update symbols to unisoc whitelist for rwsem
* 6ac0a2682b5f ANDROID: vendor_hooks: Add android_vh_rwsem_downgrade_wake_finish to rwsem_downgrade_wake
* b5cd0ba9c1d9 ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y
* 61e00b74a7a3 UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
* d7e0a2e1ec60 UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* c156e21bf559 ANDROID: GKI: Update symbol list for Amlogic
* 4891ccba5e1a UPSTREAM: bpf: Fix prog_array_map_poke_run map poke update
* ad827d850df1 ANDROID: GKI: Update honda symbol list for xt_LOG
* 84439b761f0f ANDROID: GKI: Update honda symbol list for ebt filter
* d309f1ba5cce ANDROID: GKI: Update honda symbol list for ebtables
* c7eaa9a83876 ANDROID: GKI: Update honda symbol list for net scheduler
* d8a830da7a48 ANDROID: GKI: Update honda symbol list for led-trigger
* fa05ccf53442 ANDROID: GKI: Add initial symbol list for honda
* c046e1739fb0 ANDROID: ABI: add trace_android_rvh_set_task_comm to whitelist
* 7348d925514c ANDROID: vendor_hooks: Add a hook for set_task_comm
* 0675d0fcb98d FROMLIST: binder: fix race between mmput() and do_exit()
* 0145780bfc78 ANDROID: fix KASAN-related kernel crash by KMI W/A for NETFILTER_FAMILY_BRIDGE
* 08e5bd0bb1c1 ANDROID: ABI: Update oplus symbol list
* 90540fbbb1fd ANDROID: vendor_hooks: Add hooks for rt_mutex steal
* 5b36ccdd781e FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
* f28bff2d6fc3 BACKPORT: sched: Fix stop_one_cpu_nowait() vs hotplug
* 652c1435bb4f UPSTREAM: dm verity: don't perform FEC for failed readahead IO
* 40ab06a97493 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
* 0add751dfb19 ANDROID: fuse-bpf: Follow mounts in lookups
* b37eb4523002 ANDROID: KMI workaround for CONFIG_NETFILTER_FAMILY_BRIDGE
* 40227c7ae1ee ANDROID: Snapshot Mainline's version of checkpatch.pl
* a31edd34427a FROMLIST: iommu: Avoid more races around device probe
* 8f2960e1d54c UPSTREAM: usb:typec:tcpm:support double Rp to Vbus cable as sink
* 643cef88a2ed ANDROID: GKI: Update oplus symbol list
* d0ed6ee0c8c2 ANDROID: GKI: Update oplus symbol list
* 4d401bf51f1e ANDROID: vendor_hooks: export tracepoint symbol trace_mm_vmscan_kswapd_wake
* 6c3dd25d2fde ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job
* 26794362595f Reapply "ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override"
* 256ebb8c6f6f Reapply "ANDROID: fix up rpmsg_device ABI break"
* 5f16588702b5 Reapply "ANDROID: fix up platform_device ABI break"
* 607c0e401df8 Reapply "UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()"
* 35007f71f81d Reapply "UPSTREAM: rpmsg: glink: Release driver_override"
* 1505fadea1c2 Reapply "BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device"
* 9133cee85237 Reapply "BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override"
* bf5c28708e8e Reapply "UPSTREAM: rpmsg: Constify local variable in field store macro"
* 98507f6afb1a Reapply "UPSTREAM: driver: platform: Add helper for safer setting of driver_override"
* c23c3349692d Revert "UPSTREAM: driver: platform: Add helper for safer setting of driver_override"
* c8b576b6ba68 Revert "UPSTREAM: rpmsg: Constify local variable in field store macro"
* 3d46578175c4 Revert "BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override"
* 63d8d65cde67 Revert "BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device"
* c86c5b5b2b63 Revert "UPSTREAM: rpmsg: glink: Release driver_override"
* 037015c53254 Revert "UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()"
* 01b6b46d8134 Revert "ANDROID: fix up platform_device ABI break"
* c1ac0c4c1d49 Revert "ANDROID: fix up rpmsg_device ABI break"
* 34ab3c63c23b Revert "ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override"
* 4aa19946e79f ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
* b17596c6157f ANDROID: fix up rpmsg_device ABI break
* cd70c9caf108 ANDROID: fix up platform_device ABI break
* 662269b79c74 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* 665319486474 UPSTREAM: rpmsg: glink: Release driver_override
* 710e41c44dc6 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* ad645b07be06 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* e0ce4ed8c49a UPSTREAM: rpmsg: Constify local variable in field store macro
* 6b3a7a045b44 UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* 34d95b5fde14 ANDROID: GKI: Update symbol list for transsion
* bb57557246d3 ANDROID: Add vendor_hooks to workaround CONFIG_TASK_DELAY_ACCT
* a6fbc60ab0b5 UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
* 32a5d74d0b0b ANDROID: sort Bazel load statements
* feae5e3f34ac ANDROID: fs/passthrough: Fix compatibility with R/O file system
* 43cb4b58944b UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path
* 6817e8389b50 UPSTREAM: tcp: Reduce chance of collisions in inet6_hashfn().
* 9bbe05f339da ANDROID: GKI: Update symbol list for sunxi
* f8ea9ccf1a5f ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
* a9e1122322c8 ANDROID: mm: do not allow file-backed pages from CMA

Change-Id: I6a0c0cb8b1a3ee9c970b09e40a3c73d356b607e0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>