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

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:

* da7a1489 ANDROID: introduce a vendor hook to allow speculative swap pagefaults
* a20b68c3 ANDROID: mm: allow limited speculative page faulting in do_swap_page()
* d268789e UPSTREAM: Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"
* e2495751 UPSTREAM: Revert "drm/bridge: lt9611uxc: Register and attach our DSI device at probe"
* 9b9ea9df UPSTREAM: Revert "drm/bridge: lt9611uxc: fix the race in the error path"
* 2b2398f1 ANDROID: Add vendor hooks for FUSE tmpfile support
* 54211d65 ANDROID: ABI: Add to QCOM symbols list
* e3869233 UPSTREAM: net: tls, update curr on splice as well
* 19086c5b ANDROID: GKI: abi_gki_aarch64_qcom: QCOM symbols list update
* 69b5aea2 ANDROID: GKI: db845c: Update symbols list and ABI on devm MIPI-DSI helpers
* 7898ff4e ANDROID: GKI: abi_gki_aarch64_qcom: Add to QCOM symbols list
* 569b4d61 UPSTREAM: netfilter: nf_tables: check if catch-all set element is active in next generation
* 3e89c479 Reapply "perf: Fix perf_event_validate_size()"
* 4e373a87 UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* d785e92e UPSTREAM: net/rose: Fix Use-After-Free in rose_ioctl
* a3135def UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
*   21e3d987 Merge "Merge tag 'android13-5.15.144_r00' into branch 'android13-5.15'" into android13-5.15
|\
| * f48ea9fc Merge tag 'android13-5.15.144_r00' into branch 'android13-5.15'
* | cdd96643 ANDROID: ABI break fix caused by kernfs_root and kernfs_elem_dir size increase
* | d09f6886 UPSTREAM: kernfs: fix NULL dereferencing in kernfs_remove
* | dd12fb6b UPSTREAM: kernfs: prevent early freeing of root node
* | f2242c11 UPSTREAM: kernfs: switch global kernfs_rwsem lock to per-fs lock
|/
* 14657378 Reapply "perf: Disallow mis-matched inherited group reads"
* 10d404c1 FROMGIT: usb: dwc3: gadget: Fix NULL pointer dereference in dwc3_gadget_suspend
* 57d3b677 UPSTREAM: extcon: Add EXTCON_DISP_CVBS and EXTCON_DISP_EDP
* 18a7c316 FROMGIT: usb: dwc3: host: Set XHCI_SG_TRB_CACHE_SIZE_QUIRK
* 13191555 FROMGIT: usb: host: xhci-plat: Add support for XHCI_SG_TRB_CACHE_SIZE_QUIRK
* 62865d5e ANDROID: mm: Fix VMA ref count after fast-mremap
* f36e566c ANDROID: GKI: Update abi_gki_aarch64_pasa
* 767035bb ANDROID: gki_defconfig: enable CONFIG_ARM_SCMI_TRANSPORT_VIRTIO
* 83aff341 UPSTREAM: workqueue: Warn when a new worker could not be created
* 9479bc12 ANDROID: uid_sys_stats: Drop CONFIG_UID_SYS_STATS_DEBUG logic
* 9e4c8051 ANDROID: uid_sys_stats: Fully initialize uid_entry_tmp value
* d8fc90f7 UPSTREAM: usb: gadget: uvc: Remove nested locking
* 96199e50 UPSTREAM: usb: gadget: uvc: Fix use are free during STREAMOFF
* 204618e4 ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
* b4a8ca46 ANDROID: GKI: Update symbols to symbol list
* 2d0ed050 FROMGIT: usb: dwc: ep0: Update request status in dwc3_ep0_stall_restart
* 84971537 FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields
* 2ac1467c ANDROID: vendor_hooks: fix ABI following __set_task_comm vendor hook
* ea1af4a4 FROMGIT: usb: dwc3: core: set force_gen1 bit in USB31 devices if max speed is SS
* d4919ef7 ANDROID: fs/fuse: Use extended init flags for FUSE_PASSTHROUGH
* 1a6f3feb UPSTREAM: netfilter: nf_tables: bail out on mismatching dynset and set expressions
* 739ec4a4 ANDROID: ABI: Update symbols to unisoc whitelist for rwsem
* 6ac0a268 ANDROID: vendor_hooks: Add android_vh_rwsem_downgrade_wake_finish to rwsem_downgrade_wake
* b5cd0ba9 ANDROID: gki_defconfig: Set CONFIG_IDLE_INJECT and CONFIG_CPU_IDLE_THERMAL into y
* 61e00b74 UPSTREAM: netfilter: nf_tables: skip set commit for deleted/destroyed sets
* d7e0a2e1 UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* c156e21b ANDROID: GKI: Update symbol list for Amlogic
* 4891ccba UPSTREAM: bpf: Fix prog_array_map_poke_run map poke update
* ad827d85 ANDROID: GKI: Update honda symbol list for xt_LOG
* 84439b76 ANDROID: GKI: Update honda symbol list for ebt filter
* d309f1ba ANDROID: GKI: Update honda symbol list for ebtables
* c7eaa9a8 ANDROID: GKI: Update honda symbol list for net scheduler
* d8a830da ANDROID: GKI: Update honda symbol list for led-trigger
* fa05ccf5 ANDROID: GKI: Add initial symbol list for honda
* c046e173 ANDROID: ABI: add trace_android_rvh_set_task_comm to whitelist
* 7348d925 ANDROID: vendor_hooks: Add a hook for set_task_comm
* 0675d0fc FROMLIST: binder: fix race between mmput() and do_exit()
* 0145780b ANDROID: fix KASAN-related kernel crash by KMI W/A for NETFILTER_FAMILY_BRIDGE
* 08e5bd0b ANDROID: ABI: Update oplus symbol list
* 90540fbb ANDROID: vendor_hooks: Add hooks for rt_mutex steal
* 5b36ccdd FROMGIT: PM / devfreq: Synchronize devfreq_monitor_[start/stop]
* f28bff2d BACKPORT: sched: Fix stop_one_cpu_nowait() vs hotplug
* 652c1435 UPSTREAM: dm verity: don't perform FEC for failed readahead IO
* 40ab06a9 UPSTREAM: netfilter: nft_set_pipapo: skip inactive elements during set walk
* 0add751d ANDROID: fuse-bpf: Follow mounts in lookups
* b37eb452 ANDROID: KMI workaround for CONFIG_NETFILTER_FAMILY_BRIDGE
* 40227c7a ANDROID: Snapshot Mainline's version of checkpatch.pl
* a31edd34 FROMLIST: iommu: Avoid more races around device probe
* 8f2960e1 UPSTREAM: usb:typec:tcpm:support double Rp to Vbus cable as sink
* 643cef88 ANDROID: GKI: Update oplus symbol list
* d0ed6ee0 ANDROID: GKI: Update oplus symbol list
* 4d401bf5 ANDROID: vendor_hooks: export tracepoint symbol trace_mm_vmscan_kswapd_wake
* 6c3dd25d ANDROID: mm: Add vendor hooks for recording when kswapd finishing the reclaim job
* 26794362 Reapply "ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override"
* 256ebb8c Reapply "ANDROID: fix up rpmsg_device ABI break"
* 5f165887 Reapply "ANDROID: fix up platform_device ABI break"
* 607c0e40 Reapply "UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()"
* 35007f71 Reapply "UPSTREAM: rpmsg: glink: Release driver_override"
* 1505fade Reapply "BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device"
* 9133cee8 Reapply "BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override"
* bf5c2870 Reapply "UPSTREAM: rpmsg: Constify local variable in field store macro"
* 98507f6a Reapply "UPSTREAM: driver: platform: Add helper for safer setting of driver_override"
* c23c3349 Revert "UPSTREAM: driver: platform: Add helper for safer setting of driver_override"
* c8b576b6 Revert "UPSTREAM: rpmsg: Constify local variable in field store macro"
* 3d465781 Revert "BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override"
* 63d8d65c Revert "BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device"
* c86c5b5b Revert "UPSTREAM: rpmsg: glink: Release driver_override"
* 037015c5 Revert "UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()"
* 01b6b46d Revert "ANDROID: fix up platform_device ABI break"
* c1ac0c4c Revert "ANDROID: fix up rpmsg_device ABI break"
* 34ab3c63 Revert "ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override"
* 4aa19946 ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
* b17596c6 ANDROID: fix up rpmsg_device ABI break
* cd70c9ca ANDROID: fix up platform_device ABI break
* 662269b7 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* 66531948 UPSTREAM: rpmsg: glink: Release driver_override
* 710e41c4 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* ad645b07 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* e0ce4ed8 UPSTREAM: rpmsg: Constify local variable in field store macro
* 6b3a7a04 UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* 34d95b5f ANDROID: GKI: Update symbol list for transsion
* bb575572 ANDROID: Add vendor_hooks to workaround CONFIG_TASK_DELAY_ACCT
* a6fbc60a UPSTREAM: io_uring/fdinfo: lock SQ thread while retrieving thread cpu/pid
* 32a5d74d ANDROID: sort Bazel load statements
* feae5e3f ANDROID: fs/passthrough: Fix compatibility with R/O file system
* 43cb4b58 UPSTREAM: netfilter: nf_tables: remove catchall element in GC sync path
* 6817e838 UPSTREAM: tcp: Reduce chance of collisions in inet6_hashfn().
* 9bbe05f3 ANDROID: GKI: Update symbol list for sunxi
* f8ea9ccf ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon
* a9e11223 ANDROID: mm: do not allow file-backed pages from CMA

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