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

Merge branch 'android12-5.4' into branch 'android12-5.4-lts'



This sync up the -lts branch with the latest commits in the normal
branch.  This includes the following commits:

* 1b3143b9 UPSTREAM: net: tls, update curr on splice as well
* bf4c80bc Reapply "perf: Fix perf_event_validate_size()"
* 8b697720 UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty
* 09a99bf0 UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family
* 69a7c828 Reapply "perf: Disallow mis-matched inherited group reads"
* c84a7020 UPSTREAM: ath10k: Get rid of "per_ce_irq" hw param
* 2e01a916 UPSTREAM: ath10k: Keep track of which interrupts fired, don't poll them
* 6bd5856a UPSTREAM: ath10k: Add interrupt summary based CE processing
* b45c77e9 UPSTREAM: ath10k: Wait until copy complete is actually done before completing
* 30aa7429 FROMGIT: clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd
* ddf98867 ANDROID: GKI: aarch64: Update symbols list and ABI
*   4d7b888b Merge "Merge tag 'android12-5.4.265_r00' into branch 'android12-5.4'" into android12-5.4
|\
| * 5aaee989 Merge tag 'android12-5.4.265_r00' into branch 'android12-5.4'
* | 9ca091c9 ANDROID: db845c_gki.fragment: Remove CONFIG_USB_NET_AX88*
|/
* 57a39998 UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup
* 1b58a5ed UPSTREAM: nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites
* 99693e61 ANDROID: GKI: enable some USB_NET_ config options
* c0585bc7 UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet
* 4497cd33 ANDROID: Snapshot Mainline's version of checkpatch.pl
* 8ff9dd88 FROMLIST: binder: fix memory leaks of spam and pending work
* 1303f659 UPSTREAM: netfilter: nf_tables: remove busy mark and gc batch API
* 6e57ccc2 UPSTREAM: netfilter: nft_set_hash: mark set element as dead when deleting from packet path
* 08c2cbb7 UPSTREAM: netfilter: nf_tables: adapt set backend to use GC transaction API
* 962c577e UPSTREAM: netfilter: nf_tables: GC transaction API to avoid race with control plane
* 2ce6a74f UPSTREAM: netfilter: nf_tables: don't skip expired elements during walk
* d2a0979e UPSTREAM: netfilter: nft_set_rbtree: fix overlap expiration walk
* 5c538437 UPSTREAM: netfilter: nft_set_rbtree: fix null deref on element insertion
* cb69ab1e UPSTREAM: netfilter: nft_set_rbtree: Switch to node list walk for overlap detection
* 9b9f3eda UPSTREAM: netfilter: nf_tables: drop map element references from preparation phase
* 8295ad14 UPSTREAM: netfilter: nftables: rename set element data activation/deactivation functions
* 039067a1 UPSTREAM: netfilter: nf_tables: pass context to nft_set_destroy()
* ef5670fe ANDROID: GKI: db845c: Update symbols list and ABI on pcie_capability_clear_and_set_word
* 7c903cfe ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override
* 5fb95e98 ANDROID: Use GKI Dr. No OWNERS file
* a1bbeb51 ANDROID: Remove android/OWNERs file
* 891e3982 ANDROID: fix up rpmsg_device ABI break
* cdd8a090 ANDROID: fix up platform_device ABI break
* d5125b36 UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* a55c7d25 UPSTREAM: rpmsg: glink: Release driver_override
* ebfa309c BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* b43389d6 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* 30b5d4f0 UPSTREAM: rpmsg: Constify local variable in field store macro
* 40a17fe6 UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* 8fc67ef4 FROMGIT: Input: uinput - allow injecting event times

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