Commit 19f4d8d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge android14-5.15 into android14-5.15-lts



This catches up the android14-5.15-lts branch up with a lot of bugfixes
and ABI additions that were in the android14-5.15 branch.

This consists of the following commits:

* 95e03075 BACKPORT: blk-crypto: dynamically allocate fallback profile
* c7860b4d UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* cb69585f UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 064fe280 ANDROID: Delete build.config.gki.aarch64.16k.
* 5acbeb38 FROMGIT: usb: typec: tcpm: Refactor the PPS APDO selection
* 90ad33eb ANDROID: GKI: Update symbol list for lenovo
* 844dfdef UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 7e0b682b UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* 09eac0d3 UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
* 8f1d7c68 ANDROID: Update the ABI symbol list
* 54afed88 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* d6c1899f UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* cb45423b UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* 880189fd UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* 4c73cba0 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
* eebccae5 ANDROID: Update the ABI symbol list
* a845525d FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* 4502265e BACKPORT: mm: skip CMA pages when they are not available
* 53c38ebc ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
* b88b3d36 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* 6bcc6ff8 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* b4a6c6f4 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* 1b2e6ebd UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* 4128e288 UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 1122dd37 ANDROID: Add checkpatch target.
* 056a1767 BACKPORT: FROMGIT: usb: typec: altmodes/displayport: Signal hpd when configuring pin assignment
* ee114762 BACKPORT: USB: Gadget: core: Help prevent panic during UVC unconfigure
* 7ba2131a FROMLIST: scsi: ufs: Disable zone write locking
* 4224108a FROMLIST: scsi: ufs: Split an if-condition
* 1c33b80b FROMLIST: scsi: scsi_debug: Support injecting unaligned write errors
* 6c0276ef FROMLIST: scsi: scsi_debug: Support disabling zone write locking
* 3347f7da FROMLIST: scsi: core: Retry unaligned zoned writes
* 4e1d1b83 FROMLIST: block/mq-deadline: Only use zone locking if necessary
* 5414ea3f BACKPORT: FROMLIST: block: Introduce the flag QUEUE_FLAG_NO_ZONE_WRITE_LOCK
* d01888a9 Revert "ANDROID: block: Introduce a request queue flag for pipelining zoned writes"
* 6a1ceeed Revert "ANDROID: block/mq-deadline: Only use zone locking if necessary"
* dc77af3d Revert "ANDROID: scsi: Retry unaligned zoned writes"
* 2e83e40f Revert "ANDROID: scsi: ufs: Enable zoned write pipelining"
* e08f97fe Revert "ANDROID: scsi: ufs: Disable zoned write pipelining"
* a0565250 Revert "ANDROID: scsi: core: Delay unaligned write error retries"
* 053f022e Revert "ANDROID: scsi: core: Limit zoned write retries"
* 8c7e6396 ANDROID: GKI: update mtktv symbol
* 7d47dd77 ANDROID: GKI: Add mtktv ABI symbol list, media, trace and remaining subsys
* 655a2881 ANDROID: GKI: Add mtktv ABI symbol list, cpufreq and misc
* 663ca511 ANDROID: GKI: Add mtktv ABI symbol list, net, eth, regulator and pinmux
* 99c011c3 ANDROID: GKI: Add mtktv ABI symbol list, pwm, serial and snd
* b85af8a6 ANDROID: GKI: Add mtktv ABI symbol list, usb and v4l2
* 0f986fae FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* 12fb1c3e FROMGIT: BACKPORT: Multi-gen LRU: Avoid race in inc_min_seq()
* bf03a7c9 FROMGIT: BACKPORT: Multi-gen LRU: Fix per-zone reclaim
* 0c5273e1 BACKPORT: FROMGIT: block: Improve performance for BLK_MQ_F_BLOCKING drivers
* d12306bb FROMGIT: scsi: Remove a blk_mq_run_hw_queues() call
* 8bb4682c BACKPORT: FROMGIT: scsi: Inline scsi_kick_queue()
* 4bbc8e45 ANDROID: ABI: Update STG ABI to format version 2
* a9bc0493 ANDROID: GKI: usb: phy: use ANDROID_KABI_USE for api notify_port_status
* 7aa67c1a FROMGIT: dt-bindings: phy: realtek: Add Realtek DHC RTD SoC USB 3.0 PHY
* d58cdad8 FROMGIT: dt-bindings: phy: realtek: Add Realtek DHC RTD SoC USB 2.0 PHY
* 6e97af07 FROMGIT: phy: realtek: usb: Add driver for the Realtek SoC USB 3.0 PHY
* 3dadac8b FROMGIT: phy: realtek: usb: Add driver for the Realtek SoC USB 2.0 PHY
* a600af2c FROMGIT: usb: phy: add usb phy notify port status API
* 46ee6c3c ANDROID: GKI: Create symbol files in include/config
* 9c0a91f9 ANDROID: fuse-bpf: Use stored bpf for create_open
* 77092bb6 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* fe475ca0 ANDROID: fuse-bpf: Check inode not null
* feb5ea66 ANDROID: fuse-bpf: Fix flock test compile error
* 3c49a491 ANDROID: fuse-bpf: Add partial flock support
* 95e1c94a UPSTREAM: dm init: add dm-mod.waitfor to wait for asynchronously probed block devices
* 098173a4 ANDROID: Update the ABI symbol list
* 619a5f63 ANDROID: cpuidle: teo: Export a function that allows modifying util_threshold
* d92dd731 Revert "ANDROID: GKI: Remove temp build file abi_gki_protected_exports"
* 924b7017 ANDROID: Update the ABI symbol list
* c82392da BACKPORT: blk-crypto: use dynamic lock class for blk_crypto_profile::lock
* 44cf75cc ANDROID: KVM: arm64: Fix memory ordering for pKVM module callbacks
* fddd85ce ANDROID: GKI: Update symbol list for Amlogic
* f686a35a UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 625e1470 UPSTREAM: netfilter: nf_tables: fix chain binding transaction logic
* de818a4e UPSTREAM: fs/ntfs3: Check fields while reading
* 48fffa48 ANDROID: GKI: Move GKI module headers to generated includes
* c5176136 ANDROID: set kmi_symbol_list_add_only for Kleaf builds.
* 1281598c ANDROID: GKI: Remove temp build file abi_gki_protected_exports
* 48916f99 ANDROID: GKI: Update symbol list for Amlogic
* c2591e46 UPSTREAM: ASoC: soc-pcm: Move debugfs removal out of spinlock
* 4dc2398a UPSTREAM: ASoC: soc-pcm: Fix DPCM lockdep warning due to nested stream locks
* 1dd1248e FROMLIST: fuse: revalidate: don't invalidate if interrupted
* ef049b5a ANDROID: GKI: Update symbol list for Amlogic
* 88829ece UPSTREAM: squashfs: always build "file direct" version of page actor
* 04474615 UPSTREAM: squashfs: fix cache race with migration
* f15bd09d BACKPORT: squashfs: cache partial compressed blocks
* 9d4be291 UPSTREAM: squashfs: fix buffer release race condition in readahead code
* 813c3dec UPSTREAM: squashfs: fix extending readahead beyond end of file
* dec4ef3c UPSTREAM: squashfs: fix read regression introduced in readahead code
* 80e65692 UPSTREAM: squashfs: don't call kmalloc in decompressors
* 401371c1 UPSTREAM: squashfs: don't use intermediate buffer if pages missing
* c7f85bb4 UPSTREAM: squashfs: extend "page actor" to handle missing pages
* af51b9dd UPSTREAM: squashfs: support reading fragments in readahead call
* 3ba07dee UPSTREAM: squashfs: implement readahead
* feb80c37 UPSTREAM: gfs2: Don't deref jdesc in evict
* 578ffd64 UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
* 9b30cd89 ANDROID: Incremental fs: Allocate data buffer based on input request size
* a6ab8079 ANDROID: GKI: Update symbol list for Amlogic
* b4a6ab65 ANDROID: KVM: arm64: Fix MMU context save/restore over TLB invalidation
* 770ba0ef ANDROID: Update the ABI symbol list
* 48d77946 UPSTREAM: kasan: suppress recursive reports for HW_TAGS
* 47c669cd UPSTREAM: kasan, arm64: add arch_suppress_tag_checks_start/stop
* 03471b2b BACKPORT: arm64: mte: rename TCO routines
* 867621cd BACKPORT: kasan, arm64: rename tagging-related routines
* 4c8e131d UPSTREAM: kasan: drop empty tagging-related defines
* c6243581 ANDROID: GKI: Update symbol list for Amlogic
* 0c09eb76 ANDROID: Update the ABI symbol list
* ca0cd377 UPSTREAM: usb: gadget: u_serial: Add null pointer check in gs_start_io
* b0992aa6 ANDROID: Update the ABI symbol list
* fb6593ba ANDROID: ABI: Update lenovo symbol list
* 28c03415 ANDROID: Update the ABI symbol list
* 40a4ec53 UPSTREAM: fsverity: reject FS_IOC_ENABLE_VERITY on mode 3 fds
* 28d90f10 UPSTREAM: fsverity: explicitly check for buffer overflow in build_merkle_tree()
* d53de056 ANDROID: GKI: Update RTK STB KMI symbol list
* 0765cda3 UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
* 38fff8f3 Revert "FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue"
* 60a2ccab UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* ebe7bbdf UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
* 4d634bb7 UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
* b8cb7eb0 BACKPORT: revert "net: align SO_RCVMARK required privileges with SO_MARK"
* 9b469972 UPSTREAM: wifi: cfg80211: fix link del callback to call correct handler
* dc11ed25 UPSTREAM: wifi: cfg80211: reject bad AP MLD address
* 2e6bf292 UPSTREAM: KVM: arm64: Populate fault info for watchpoint
* c8a3a084 UPSTREAM: KVM: Fix vcpu_array[0] races
* d18fa8c5 UPSTREAM: media: pvrusb2: fix DVB_CORE dependency
* f4aace94 UPSTREAM: kasan: hw_tags: avoid invalid virt_to_page()
* 8f4b51c4 UPSTREAM: scsi: ufs: core: mcq: Fix &hwq->cq_lock deadlock issue
* 94fb13dc UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 759c5c3f UPSTREAM: netfilter: nf_tables: incorrect error path handling with NFT_MSG_NEWRULE
* be89d165 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
* 4ae6b40b UPSTREAM: PCI/PM: Extend D3hot delay for NVIDIA HDA controllers
* 738dfcc0 UPSTREAM: wifi: cfg80211: fix MLO connection ownership
* d0e0e85d UPSTREAM: wifi: nl80211: fix NULL-ptr deref in offchan check
* 9e7678cc UPSTREAM: scsi: ufs: mcq: Use active_reqs to check busy in clock scaling
* 9d0d5eac UPSTREAM: scsi: ufs: mcq: qcom: Clean the return path of ufs_qcom_mcq_config_resource()
* fa5c4a21 UPSTREAM: scsi: ufs: mcq: qcom: Fix passing zero to PTR_ERR
* 63ab8dfd UPSTREAM: scsi: ufs: mcq: Fix incorrectly set queue depth
* 6423bd5a UPSTREAM: net: use a bounce buffer for copying skb->mark
* 65656375 UPSTREAM: io_uring: hold uring mutex around poll removal
* 1f5a89e0 ANDROID: Set arch attribute for allmodconfig builds
* ceb26af3 ANDROID: KVM: arm64: Remove 'struct kvm_vcpu' from the KMI
* aad223db UPSTREAM: KVM: arm64: Restore GICv2-on-GICv3 functionality
* 2c17fbc0 UPSTREAM: KVM: arm64: vgic: Wrap vgic_its_create() with config_lock
* ec0944c3 UPSTREAM: KVM: arm64: vgic: Fix a circular locking issue
* e4b31e74 UPSTREAM: KVM: arm64: vgic: Don't acquire its_lock before config_lock
* b7e1f97e BACKPORT: KVM: arm64: Avoid lock inversion when setting the VM register width
* 0c5ec70e UPSTREAM: KVM: arm64: Avoid vcpu->mutex v. kvm->lock inversion in CPU_ON
* 60266126 BACKPORT: KVM: arm64: Use config_lock to protect data ordered against KVM_RUN
* 1536afa2 UPSTREAM: KVM: arm64: Use config_lock to protect vgic state
* 1d194af6 BACKPORT: KVM: arm64: Add helper vgic_write_guest_lock()
* 54b1b225 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
* b3167530 UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
* eda34db2 ANDROID: GKI: Update symbol list for Amlogic
* d8eb5e7c ANDROID: db845c: Fix build when using --kgdb
* d40f3254 FROMLIST: kheaders: dereferences the source tree
* 2ebd1138 FROMLIST: f2fs: remove i_xattr_sem to avoid deadlock and fix the original issue
* 258f1131 ANDROID: db845c: Local define for db845c targets
* 2af5c433 ANDROID: Update the ABI symbol list
* 5af00d85 ANDROID: Export cpu_push_stop
* 3c328a63 ANDROID: Update the ABI symbol list
* bdd2312e ANDROID: rockpi4: Fix build when using --kgdb
* d1601b50 ANDROID: kleaf: android/gki_system_dlkm_modules is generated.
* a7068670 ANDROID: fuse-bpf: Move FUSE_RELEASE to correct place
* ad201255 ANDROID: fuse-bpf: Ensure bpf field can never be nulled
* bd30e9ff ANDROID: Update the ABI symbol list
* 7a26ac9e ANDROID: Delete MODULES_LIST from build configs.
* 270b27a6 ANDROID: ABI: Update lenovo symbol list
* 0a9d005c UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
* d465a446 UPSTREAM: xfs: verify buffer contents when we skip log replay

Change-Id: I56fc52175fbae29d6dea862b66a619b249e93e7c
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 72b4713d 95e03075
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment