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

Merge branch 'android14-6.1' into branch 'android14-6.1-lts'



Catch up on some ABI updates from the non-lts branch.  This includes the
following commits:

* 77fec6ce UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* e2746800 UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* 26f2c9be UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
* 99aea323 UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
* b76ed118 ANDROID: GKI: Add symbol list for Nothing
* cfa15438 ANDROID: GKI: Update honda symbol list for asound
* 9be03f04 ANDROID: GKI: Update honda symbol list for xt_LOG
* a6cb9e0a ANDROID: GKI: Update honda symbol list for ebtables
* e6dcd23d ANDROID: GKI: Update honda symbol list for net scheduler
* 35478215 ANDROID: softirq: add tasklet to LONG_SOFTIRQ_MASK
* ca409578 ANDROID: Update the ABI symbol list
* 59ef5457 ANDROID: vendor_hooks: add restricted vendor hook for meminfo
* be55946e ANDROID: Update the ABI symbol list
* 4b8e1f52 BACKPORT: cpufreq: Don't unregister cpufreq cooling on CPU hotplug
* 165b0171 FROMGIT: usb: typec: tcpm: Correct the PDO counting in pd_set
* 5dc2bc29 UPSTREAM: tls: fix race between tx work scheduling and socket close
* cdc8aeb8 UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* 5b4439c0 UPSTREAM: tls: fix race between async notify and socket close
* fd16669b UPSTREAM: net: tls: factor out tls_*crypt_async_wait()
* 5cb88480 UPSTREAM: tls: extract context alloc/initialization out of tls_set_sw_offload
* 338203a8 BACKPORT: mm: update mark_victim tracepoints fields
* 97808981 Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"
* dfd2c809 ANDROID: Update the ABI symbol list
* babe7ef8 ANDROID: export two function to reclaim memory
* 66193f86 ANDROID: add reclaim tune parameter functions
* 27c44305 UPSTREAM: netfilter: nf_tables: disallow anonymous set with timeout flag
* 56ba301c ANDROID: drop redundant OWNERS_DrNo file
* 60534eef UPSTREAM: ALSA: virtio: Fix "Coverity: virtsnd_kctl_tlv_op(): Uninitialized variables" warning.
* e7f7d554 UPSTREAM: ALSA: virtio: add support for audio controls
* 0fd20184 ANDROID: Update symbols list for virtio_snd.ko audio controls
* ebcdb9dc ANDROID: Move cpu_busy_with_softirqs() into sched.h
* 5dd0c481 UPSTREAM: mm: page_alloc: unreserve highatomic page blocks before oom
* 6d3db504 UPSTREAM: mm: page_alloc: enforce minimum zone size to do high atomic reserves
* 58699757 UPSTREAM: mm: page_alloc: correct high atomic reserve calculations
* 9ce8f4d0 ANDROID: Update the ABI symbol list
* dcdec80d ANDROID: Export cpu_busy_with_softirqs()
* baba019a ANDROID: GKI: update symbol list file for xiaomi
* 4747c756 Reapply "ANDROID: null_blk: Support configuring the maximum segment size"

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