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

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



Catch up on a number of changes merged on the normal branch to the LTS
branch.  This includes the following commits:

* eb7a4691 ANDROID: introduce a vendor hook to allow speculative swap pagefaults
* 8014b372 ANDROID: mm: allow limited speculative page faulting in do_swap_page()
* d87717c9 ANDROID: GKI: fix ABI breakage in struct ipv6_devconf
* e9eafb11 Reapply "net: release reference to inet6_dev pointer"
* bdf29bd2 Reapply "net: change accept_ra_min_rtr_lft to affect all RA lifetimes"
* aa092071 Reapply "net: add sysctl accept_ra_min_rtr_lft"
* cfef8643 ANDROID: GKI: explicit include of stringify.h
* 1bbef275 ANDROID: GKI: Preserve CRC value for wireless_send_event()
* 6fba8c7e BACKPORT: wifi: nl80211: Allow authentication frames and set keys on NAN interface
* a2c880b7 UPSTREAM: wifi: cfg80211: Allow action frames to be transmitted with link BSS in MLD
* a2a5f227 BACKPORT: wifi: cfg80211: include puncturing bitmap in channel switch events
* 2fe5888b BACKPORT: wifi: nl80211: validate and configure puncturing bitmap
* 1ef87d0c BACKPORT: wifi: cfg80211: move puncturing bitmap validation from mac80211
* c7c4d0de UPSTREAM: wifi: nl80211: add MLO_LINK_ID to CMD_STOP_AP event
* e17b1173 ANDROID: GKI: add symbol list for pixel watch
* cea40c5b ANDROID: GKI: Do not export non-existent unsafe DDK header
* 7aa92402 UPSTREAM: net: tls, update curr on splice as well
* cf3a0a20 BACKPORT: f2fs: Restrict max filesize for 16K f2fs
* 27bd7b3d BACKPORT: f2fs: Support Block Size == Page Size
* e5485146 UPSTREAM: arm64: scs: Disable LTO for SCS patching code
* 46ed54bf UPSTREAM: netfilter: nf_tables: check if catch-all set element is active in next generation
* c5233870 ANDROID: Update the ABI symbol list
* 8d40c367 Reapply "perf: Fix perf_event_validate_size()"
* 67121846 ANDROID: binder: fix integer as NULL assignment
* d632b78a UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* f7b4a155 UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
* 0a649455 ANDROID: ABI break fix caused by kernfs_root and kernfs_elem_dir size increase
* 1de2411a UPSTREAM: kernfs: fix NULL dereferencing in kernfs_remove
* 05de9bce UPSTREAM: kernfs: prevent early freeing of root node
* d8dbc91f UPSTREAM: kernfs: switch global kernfs_rwsem lock to per-fs lock
* 73ba66a3 Reapply "perf: Disallow mis-matched inherited group reads"
* 076f9f28 FROMGIT: mm: memcg: don't periodically flush stats when memcg is disabled
* a330adce UPSTREAM: Revert "drm/bridge: lt9611uxc: Switch to devm MIPI-DSI helpers"
* ac7b9d21 UPSTREAM: Revert "drm/bridge: lt9611uxc: Register and attach our DSI device at probe"
* a9030727 UPSTREAM: Revert "drm/bridge: lt9611uxc: fix the race in the error path"
* d9ce9afc ANDROID: mm: Fix VMA ref count after fast-mremap

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