Commit 045b9e5d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



This syncs the android14-5.15-lts branch up with all of the recent
changes that have gone into the 'android14-5.15' branch.

Included in here are the following commits:

* edbf1821 ANDROID: GKI: Update MTKOTT symbol list
* 9aa89cf6 UPSTREAM: libceph: harden msgr2.1 frame segment length checks
* 25f13a24 UPSTREAM: netfilter: ipset: Add schedule point in call_ad().
* 813d5c85 UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* 04a0c46b UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 7d13770c FROMGIT: f2fs: do not return EFSCORRUPTED, but try to run online repair
* 3525a729 ANDROID: sched: Add vendor hook for util_fits_cpu
* 3191bf92 ANDROID: KVM: Update nVHE stack size to 8KB
* d217ccf7 ANDROID: Add CONFIG_BLK_DEV_NULL_BLK=m to gki_defconfig
* 845ae208 ANDROID: GKI: Update symbol list for Amlogic
* 17cbc8f6 BACKPORT: take care to handle NULL ->proc_lseek()
* 01bff482 ANDROID: KVM: arm64: Allow setting device attr in stage-2 PTEs
* 077735bc ANDROID: KVM: arm64: Fix hyp tracing build dependencies
* 673d30e3 ANDROID: GKI: Update symbol list for Amlogic
* ed571977 ANDROID: vendor_hooks: add vendor hook in __alloc_pages()
* fb8d8135 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* 4b27296b ANDROID: Add kunit targets.
* a3e337eb ANDROID: Enable CONFIG_KUNIT=y.
* 734865de FROMGIT: mm/madvise: fix madvise_pageout for private file mappings
* 4e664ccb UPSTREAM: netfilter: xt_u32: validate user space input
* a114e5dc UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* fae3ecca UPSTREAM: net/sched: Retire rsvp classifier
* 002ad09f UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* bfeb57ae FROMGIT: scsi: ufs: Set the CP flag for RT requests
* 67d33362 FROMGIT: scsi: ufs: Simplify ufshcd_comp_scsi_upiu()
* 0b5cd2a4 ANDROID: scsi: Limit unaligned zoned write retries
* f1b91d8b ANDROID: block: Preserve the order of requeued zoned writes
* d7f09c11 ANDROID: gki_defconfig: Enable CONFIG_BLK_CGROUP_IOPRIO
* e2dadb50 ANDROID: GKI: Update symbol list for Amlogic
* 5b8c9a00 ANDROID: vendor_hooks: Add hooks to avoid key threads stalled in memory allocations
* a1ebbe9d ANDROID: KVM: arm64: Add missing hyp events for forwarded SMCs
* 86fb1cdb ANDROID: GKI: Update symbol list for lenovo
* 2c0ad668 ANDROID: KVM: arm64: Store hyp address in the host fp state array
* 813b98b1 ANDROID: KVM: arm64: Allocate host fp/simd state later in initialization
* f44a014f ANDROID: GKI: Update symbol list for Amlogic
* 0973d792 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
* 46a1c28f ANDROID: mm: Use intended order-adjusted batch size
* 6e161d90 ANDROID: mm: cma: proper ret type for tasks interrupted by fatal signal
* cbd1dda1 ANDROID: GKI: Update RTK STB KMI symbol list
* 79ef0ab3 ANDROID: Update the ABI symbol list
* d15ca4fa ANDROID: GKI: Update RTK STB KMI symbol list
* 63fc1891 BACKPORT: usb: typec: bus: verify partner exists in typec_altmode_attention
* d61f6702 ANDROID: mm/memory_hotplug: Fix error path handling
* 3207c9ec BACKPORT: mm: page_alloc: fix CMA and HIGHATOMIC landing on the wrong buddy list
* b0572dcd UPSTREAM: ARM: ptrace: Restore syscall skipping for tracers
* 277d3989 UPSTREAM: ARM: ptrace: Restore syscall restart tracing
* dfac06d2 FROMGIT: f2fs: preload extent_cache for POSIX_FADV_WILLNEED
* a430d098 UPSTREAM: bpf, sockmap: fix deadlocks in the sockhash and sockmap
* eb21f15a ANDROID: GKI: Update symbol list for Amlogic
* 130bf744 UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* ba5f5fb1 UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* 360c724a ANDROID: GKI: Update symbol list for Amlogic
* d3c35bf4 ANDROID: vendor_hooks: add vendor hook in xhci_urb_suitable_for_idt()
* a29acad9 ANDROID: uid_sys_stat: instead update_io_stats_uid_locked to update_io_stats_uid
* a1931ea6 ANDROID: uid_sys_stat: split the global lock uid_lock to the fine-grained locks for each hlist in hash_table.
* 19b5b13d ANDROID: Flush deferred probe list before dropping host priv
* 93ef4391 ANDROID: KVM: arm64: Don't force pte mappings in [n]VHE guest stage-2
* f43b021e FROMGIT: f2fs: preload extent_cache for POSIX_FADV_WILLNEED
* a0622550 ANDROID: tools/resolve_btfids: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* 4aee33cb ANDROID: libsubcmd: Hoist iterator variable declarations in parse_options_subcommand()
* cc1046e3 ANDROID: block: Revert "Send requeued requests to the I/O scheduler"
* c7b7058f ANDROID: block: Revert "Preserve the order of requeued requests"
* 1988ebab ANDROID: block: Restore request_queue.requeue_work
* cfe32cb3 BACKPORT: FROMGIT: scsi: ufs: Include the SCSI ID in UFS command tracing output
* 33d2a21b UPSTREAM: ARM: 9269/1: vfp: Add hwcap for FEAT_DotProd
* 49c6c1e4 UPSTREAM: ARM: 9268/1: vfp: Add hwcap FPHP and ASIMDHP for FEAT_FP16
* 52e28a12 UPSTREAM: ARM: 9267/1: Define Armv8 registers in AArch32 state
* a6f12f29 ANDROID: mm: fix freeing of MIGRATE_ISOLATE page
* 5da77083 ANDROID: GKI: Update symbol list for Amlogic
* e5e093b9 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
* f0fb694b UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* e7c8c710 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
* 19852c13 ANDROID: GKI: Update RTK STB KMI symbol list
* 84d3e597 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* 40d7d944 ANDROID: Add initial symbol list for Tuxera
* 37f69731 ANDROID: GKI: update mtktv symbol
* 42e50806 ANDROID: GKI: Update symbol list for Amlogic
* 20fb3d02 ANDROID: vendor_hooks: add vendor hook in cma_alloc()
* 5fae5401 BACKPORT: mm/filemap.c: fix update prev_pos after one read request done
* e9e2caea UPSTREAM: usb: typec: tcpm: set initial svdm version based on pd revision
* b2cc1ef4 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
* dd8ce75b ANDROID: Update the ABI symbol list
* 99aa573d ANDROID: fs/proc: Perform priority inheritance around access_remote_vm()
* 89a4bca2 ANDROID: Update the ABI symbol list
* 3374f61d ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
* f627c35d ANDROID: GKI: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S
* 633bfdda ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* 4d8e7273 ANDROID: uid_sys_stats: Use llist for deferred work
* 99deaa6c ANDROID: uid_sys_stats: Use a single work for deferred updates
* 1b5b7050 ANDROID: fuse-bpf: Get correct inode in mkdir
* 347a154d ANDROID: blk-mq: Run zoned blocking queues asynchronously
* be1b509d ANDROID: add initial symbol list for mtkott
* 4f597a19 BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
* 6a9549f0 UPSTREAM: netfilter: nf_tables: deactivate catchall elements in next generation
* ca527661 ANDROID: GKI: Update symbol list for Amlogic
* 0fead696 ANDROID: Update the ABI symbol list
* 2296fa4c UPSTREAM: erofs: refine managed inode stuffs
* b014a903 UPSTREAM: exfat: check if filename entries exceeds max filename length
* 47929f7d ANDROID: GKI: Update symbol list for lenovo
* 2ab9f0ba ANDROID: Add initial QCOM symbol list
* bcae79d3 ANDROID: GKI: Update RTK STB KMI symbol list
* 441510cf ANDROID: vendor_hooks: add vendor hook in current_alloc_flags()
* ebd14a6c ANDROID: vendor_hooks: add vendor hook to report acr_info in cma_alloc()
* 9a7a2718 ANDROID: GKI: Update symbol list for Amlogic
* 7b00dfaf BACKPORT: FROMGIT: netfilter: nfnetlink_log: always add a timestamp
* 98a63aed UPSTREAM: cpuidle: Add cpu_idle_miss trace event
* 3abb2ec8 ANDROID: Use alias for old rules.
* 2c764152 ANDROID: Add arch specific gki module list targets
* e8b59bcd ANDROID: fips140: fix the error injection module parameters

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