Merge branch 'android11-5.4' into branch 'android11-5.4-lts'
Merge in the latest changes from 'android11-5.4' into the LTS branch so we have those changes in here as well. This includes the following commits: * b0b1d6d1 UPSTREAM: net: tls, update curr on splice as well * 78f2cf25 Reapply "perf: Fix perf_event_validate_size()" * 087b4792 UPSTREAM: ida: Fix crash in ida_free when the bitmap is empty * 73bfa95e UPSTREAM: netfilter: nf_tables: Reject tables of unsupported family * a34cc1dc Reapply "perf: Disallow mis-matched inherited group reads" * aea71020 UPSTREAM: ath10k: Get rid of "per_ce_irq" hw param * 89945968 UPSTREAM: ath10k: Keep track of which interrupts fired, don't poll them * d9f1b99f UPSTREAM: ath10k: Add interrupt summary based CE processing * 0226ac13 UPSTREAM: ath10k: Wait until copy complete is actually done before completing * a7a2a20f FROMGIT: clk: qcom: gcc-sdm845: Add soft dependency on rpmhpd * 80118b74 Merge tag 'android11-5.4.265_r00' into branch 'android11-5.4' * 70db018a UPSTREAM: ipv4: igmp: fix refcnt uaf issue when receiving igmp query packet * 5ae6be03 ANDROID: Snapshot Mainline's version of checkpatch.pl * f5180407 UPSTREAM: nvmet-tcp: Fix a possible UAF in queue intialization setup * 0581932d UPSTREAM: nvmet-tcp: move send/recv error handling in the send/recv methods instead of call-sites * 81334f26 UPSTREAM: netfilter: nf_tables: remove busy mark and gc batch API * bdb31e6e UPSTREAM: netfilter: nft_set_hash: mark set element as dead when deleting from packet path * a65e87c1 UPSTREAM: netfilter: nf_tables: adapt set backend to use GC transaction API * adc9cb06 UPSTREAM: netfilter: nf_tables: GC transaction API to avoid race with control plane * 4ce6a733 UPSTREAM: netfilter: nft_set_rbtree: fix overlap expiration walk * 1b7330db UPSTREAM: netfilter: nft_set_rbtree: fix null deref on element insertion * f896aebc UPSTREAM: netfilter: nft_set_rbtree: Switch to node list walk for overlap detection * 3a298023 UPSTREAM: netfilter: nf_tables: drop map element references from preparation phase * 28ca0533 UPSTREAM: netfilter: nftables: rename set element data activation/deactivation functions * e85a3e2c ANDROID: ABI: Update allowed list for QCOM * 42ae17e6 BACKPORT: ALSA: compress: Allow pause and resume during draining * a8427cae UPSTREAM: netfilter: nf_tables: pass context to nft_set_destroy() * 1ab45006 UPSTREAM: netfilter: nf_tables: don't skip expired elements during walk * 30cf530f ANDROID: GKI: db845c: Update symbols list and ABI on rpmsg_register_device_override * eb1843e8 ANDROID: Use GKI Dr. No OWNERS file * bbbaa681 ANDROID: Remove android/OWNERs file * b7ba0d93 FROMGIT: Input: uinput - allow injecting event times Change-Id: I147a09fc7cf8a55fb05e4ecec26028e59c8802ea Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please register or sign in to comment