mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 10:31:46 +09:00
4b669fd9c3
android14-6.1 April 2024 release 1 Artifacts: https://ci.android.com/builds/submitted/11722365/kernel_aarch64/latest * tag 'android14-6.1-2024-04_r1': (2950 commits) UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path ANDROID: GKI: Add symbol list for Nothing ANDROID: GKI: Update honda symbol list for asound ANDROID: GKI: Update honda symbol list for xt_LOG ANDROID: GKI: Update honda symbol list for ebtables ANDROID: GKI: Update honda symbol list for net scheduler ANDROID: softirq: add tasklet to LONG_SOFTIRQ_MASK ANDROID: Update the ABI symbol list ANDROID: vendor_hooks: add restricted vendor hook for meminfo ANDROID: Update the ABI symbol list BACKPORT: cpufreq: Don't unregister cpufreq cooling on CPU hotplug FROMGIT: usb: typec: tcpm: Correct the PDO counting in pd_set UPSTREAM: tls: fix race between tx work scheduling and socket close UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain UPSTREAM: tls: fix race between async notify and socket close UPSTREAM: net: tls: factor out tls_*crypt_async_wait() UPSTREAM: tls: extract context alloc/initialization out of tls_set_sw_offload ... Conflicts: drivers/clk/rockchip/clk-rk3568.c drivers/devfreq/event/rockchip-dfi.c drivers/gpu/drm/rockchip/rockchip_drm_vop.c drivers/gpu/drm/rockchip/rockchip_drm_vop2.c drivers/i2c/busses/i2c-rk3x.c drivers/i2c/i2c-core-base.c drivers/net/ethernet/stmicro/stmmac/stmmac_main.c drivers/nvme/host/nvme.h drivers/usb/dwc2/params.c drivers/usb/host/xhci-plat.c drivers/usb/host/xhci.c drivers/usb/typec/tcpm/tcpm.c Change-Id: I293878744024ce4a1bd6007f89755f18a5627ac6 Signed-off-by: Sandy Huang <hjc@rock-chips.com> Signed-off-by: Frank Wang <frank.wang@rock-chips.com> Signed-off-by: Tao Huang <huangtao@rock-chips.com>