Skip to content
Commit 6e04c1cc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



We need the updates in the normal branch due to the symbol changes
happening.  This consists of the following changes:

* 92432f07 ANDROID: GKI: Update the ABI symbol list
* b86713e3 UPSTREAM: virtio: Add support for no-reset virtio PCI PM
* 7dc3b2e4 UPSTREAM: netfilter: nf_tables: check if catch-all set element is active in next generation
* 8d4d76a2 UPSTREAM: net: tls, update curr on splice as well
* 9e2b7753 ANDROID: Update the ABI symbol list
* 5a1f8b6b ANDROID: Add pci_read_config_word to virtual device symbol list
* e356cae9 ANDROID: Export kthread_set_per_cpu
* 81c92262 ANDROID: GKI: fix ABI breakage in struct ipv6_devconf
* 20131b78 Reapply "net: release reference to inet6_dev pointer"
* c2c02730 Reapply "net: change accept_ra_min_rtr_lft to affect all RA lifetimes"
* a8053aad Reapply "net: add sysctl accept_ra_min_rtr_lft"
* fc6c1b3a ANDROID: GKI: explicit include of stringify.h
* 8481b97d BACKPORT: erofs: fix infinite loop due to a race of filling compressed_bvecs
* 886c9d1f ANDROID: arm64: virt: Invalidate tlb once the balloon before reporting/inflating
* 4aedc102 ANDROID: arm64: virt: Make the page_relinquish call generic
* d3f73f04 UPSTREAM: drm/msm/dsi: Use pm_runtime_resume_and_get to prevent refcnt leaks
* df2fe1ad UPSTREAM: drm/msm/dsi: Enable runtime PM
* 6053d8ff UPSTREAM: arm64: scs: Disable LTO for SCS patching code
* 696293ef ANDROID: GKI: Update symbol list for mtk
* 6338e415 BACKPORT: f2fs: Restrict max filesize for 16K f2fs
* 8c8bcbdf BACKPORT: f2fs: Support Block Size == Page Size
* eb20497d ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 1e6c1ca9 UPSTREAM: usb: typec: tcpm: fix the PD disabled case
* ba97ad7b UPSTREAM: netfilter: nf_tables: reject QUEUE/DROP verdict parameters
* 76f0396b ANDROID: ABI: Update oplus symbol list
* 016b6402 ANDROID: fuse: Fix the issue of fuse_dentry_canonical_path
* 5eb1cbb3 ANDROID: Update the ABI symbol list
* b53c3cb3 ANDROID: Export cpufreq_driver_test_flags()
* 9b476ebe ANDROID: Build null_blk and scsi_debug as kernel modules
* 01472f3a ANDROID: GKI: Update the pixel symbol list
* fbcd29ac ANDROID: usb: dwc3: export tracepoint for dwc3 read/write
* 0123832f ANDROID: scsi: ufs: add vendor hook to override key reprogramming
* 7ce11730 ANDROID: vendor_hooks: Add hook for binder_detect_low_async_space_locked
* 7b6a6228 ANDROID: Update the ABI symbol list
* db94de2a ANDROID: Update the ABI representation
* e08371bc UPSTREAM: usb: typec: tcpm: Support multiple capabilities
* 4025820c UPSTREAM: usb: typec: tcpm: Parse Accessory Mode information

Change-Id: Ibe422d476544081f14095e025b2a77ab70c577df
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents c0f972f0 92432f07
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment