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

Merge android16-6.12 into android16-6.12-lts



This merges the android16-6.12 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 030e00a2 ANDROID: 16K: Use vma_area slab cache for pad VMA
* 2078b865 ANDROID: ABI: Update pixel symbol list
* b4b78212 ANDROID: cgroup: Add android_rvh_cgroup_force_kthread_migration
* 94ce385c ANDROID: ashmem_rust: return EINVAL on offset > size
* d7b077d5 ANDROID: GKI: update symbols for xiaomi.
* 5fdebcb0 ANDROID: Update symbols list for imx
* 9d80e325 ANDROID: GKI: add allowed list for Exynosauto SoC
* b6652492 ANDROID: rust_binder: enforce that overflow in ptr_align is checked
* dc4eb848 ANDROID: GKI: update the ABI symbol list
* 19151c7f ANDROID: freezer: Add vendor hook to freezer for GKI purpose.
* 56508b8d ANDROID: freezer: export the freezer_cgrp_subsys for GKI purpose.
* 275bcc2e ANDROID: GKI: Update symbol list for xiaomi
* 159dbf71 ANDROID: vendor_hooks: export cgroup_threadgroup_rwsem
* 764e54b8 ANDROID: GKI: update the ABI symbol list
* 5111c399 ANDROID: cgroup: Add vendor hook for cpuset.
* 478166f7 ANDROID: GKI: Update symbol list for vivo
* 6eca3e3f ANDROID: mm: Reset unused page flag bits on free
* 52e6e040 ANDROID: ashmem: fix overflow on __page_align
* a25c0fcf ANDROID: Align x86-64 microdroid cgroup support with aarch64 microdroid
* 986d344a ANDROID: Enable memory controller for microdroid
* 1d4f4d44 ANDROID: ABI: Update pixel symbol list
* 1195c63b ANDROID: vendor_hook: add trace_android_rvh_setscheduler_prio
* 41cfa0c6 FROMGIT: wifi: cfg80211: Add support for link reconfiguration negotiation offload to driver
* ada89d78 FROMGIT: wifi: cfg80211: Improve the documentation for NL80211_CMD_ASSOC_MLO_RECONF
* 5bf4b91e Merge tag 'android16-6.12.30_r00' into android16-6.12
* d9fd901b UPSTREAM: scsi: ufs: core: Don't perform UFS clkscaling during host async scan
* 6c1c18fc ANDROID: GKI: net: add vendor hooks net qos for gki purpose
* 54f24638 ANDROID: Update symbols list for imx
* f9fbc66f ANDROID: GKI: Update symbol list for xiaomi
* d0b1c843 ANDROID: mm: export mem_cgroup_move_account
* ac2a74af ANDROID: mm: add vendor hook to trace shrink_node
* 1da7155f ANDROID: mm: add vendor hook to add folio to specific memcg
* 72ccaf35 ANDROID: rust_binder: allow duplicated freeze listener cookies
* ace4b829 ANDROID: GKI: Update symbol list for xiaomi
* 9651bcfa ANDROID: vendor_hook: Add hook is to optimize the time consumption of shrink slab.
* 30b14cda ANDROID: vendor_hooks: add symbols for lazy preemption
* 10fb4d14 ANDROID: GKI: Add zap_page_range_single to symbol list for qcom
* ac5b13d8 ANDROID: GKI: Add unisoc modules symbols
* 0697e85a FROMGIT: genirq/cpuhotplug: Restore affinity even for suspended IRQ
* a5e74523 FROMGIT: genirq/cpuhotplug: Rebalance managed interrupts across multi-CPU hotplug
* 0df9d757 ANDROID: GKI: Add symbol to symbol list for vivo.
* 19a7e071 ANDROID: vendor_hooks: add hooks in prctl_set_vma
* 9197be6c ANDROID: GKI: Update symbol list for Amlogic
* 85da719a ANDROID: GKI: Update symbol list for vivo
* c4de3408 ANDROID: KVM: Don't release the VM memory after it is given to the hyp
* df79f04f ANDROID: rust_binder: add Process::lock_with_nodes()
* d9be16a9 ANDROID: rust_binder: freeze notifications
* 882b6c02 ANDROID: tvgki: disabling CONFIG_DEBUG_INFO_BTF in tvgki
* 272df8fc ANDROID: tvgki: disabling CONFIG_DEBUG_FS in tvgki
* c1a3f22e ANDROID: CRC / ABI fixups for sched_dl_entity bitfield addition
* 738664c5 FROMGIT: sched/deadline: Less agressive dl_server handling
* 35c421e8 UPSTREAM: gendwarfksyms: Fix structure type overrides
* 511b97bb Revert "FROMLIST: gendwarfksyms: Fix structure type overrides"
* f4feb433 BACKPORT: erofs: lazily initialize per-CPU workers and CPU hotplug hooks
* d05f5863 FROMGIT: scsi: ufs: mcq: Delete ufshcd_release_scsi_cmd() in ufshcd_mcq_abort()
* 3d0eadbe ANDROID: GKI: vivo add symbols to symbol list
* 0b0551f1 BACKPORT: FROMGIT: arm64: Add override for MPAM
* 2de46710 ANDROID: tvgki: disabling CONFIG_KALLSYMS_ALL in tvgki
* 9450d0b0 ANDROID: tvgki: disabling CONFIG_KVM in tvgki
* e328f87b ANDROID: tvgki: disabling CONFIG_BLK_DEV_NVME in tvgki
* 3031d665 ANDROID: tvgki: disabling CONFIG_ANDROID_VENDOR_OEM_DATA in tvgki
* c7ee6ca6 ANDROID: tvgki: disabling CONFIG_ANDROID_KABI_RESERVE in tvgki
* 75547173 ANDROID: vendor_hooks: add one hook for lazy preemption
* 31e7de74 ANDROID: disable KABI macros for VDSO and EFI libstub
* 52cc6479 ANDROID: virt: gunyah: Add a gunyah hcall for ioremap
* a7c066a3 ANDROID: rust_binder: access lru list through private data
* cf1ef612 FROMLIST: KVM: arm64: Restrict FF-A host version renegotiation
* e97af2a2 ANDROID: more KABI macros for gendwarfksyms
* 2c693813 FROMGIT: block: don't use submit_bio_noacct_nocheck in blk_zone_wplug_bio_work
* b1605a04 ANDROID: Revert "block: Fix a deadlock related freezing zoned storage devices"
* 9538ac3d FROMLIST: gendwarfksyms: Fix structure type overrides
* 7ef7fa4d UPSTREAM: Documentation/kbuild: Add new gendwarfksyms kABI rules
* ce025a69 UPSTREAM: Documentation/kbuild: Drop section numbers
* b0ac9a4d UPSTREAM: gendwarfksyms: Add a kABI rule to override type strings
* 7001a993 UPSTREAM: gendwarfksyms: Add a kABI rule to override byte_size attributes
* 8b73dde5 UPSTREAM: gendwarfksyms: Clean up kABI rule look-ups
* ede5aa33 FROMGIT: platform/chrome: cros_ec_typec: Defer probe on missing EC parent
* c40a59df ANDROID: Avoid ABI Breakage
* 5161413c UPSTREAM: f2fs: fix to correct check conditions in f2fs_cross_rename
* 2244c336 UPSTREAM: f2fs: use d_inode(dentry) cleanup dentry->d_inode
* 63352a68 UPSTREAM: f2fs: fix to skip f2fs_balance_fs() if checkpoint is disabled
* 98225182 UPSTREAM: f2fs: add ckpt_valid_blocks to the section entry
* 75dfdc1e UPSTREAM: f2fs: add a method for calculating the remaining blocks in the current segment in LFS mode.
* b3f29a67 UPSTREAM: f2fs: use vmalloc instead of kvmalloc in .init_{,de}compress_ctx
* b1222fd6 UPSTREAM: f2fs: don't over-report free space or inodes in statvfs
* 5f553da1 UPSTREAM: f2fs: handle error cases of memory donation
* afb757a9 UPSTREAM: f2fs: fix to bail out in get_new_segment()
* f2afd014 UPSTREAM: f2fs: sysfs: export linear_lookup in features directory
* ff061af5 UPSTREAM: f2fs: sysfs: add encoding_flags entry
* 5c1983aa UPSTREAM: f2fs: zone: fix to calculate first_zoned_segno correctly
* 44c66f24 UPSTREAM: f2fs: fix to do sanity check on sit_bitmap_size
* 03dc0679 UPSTREAM: f2fs: fix to detect gcing page in f2fs_is_cp_guaranteed()
* 7221743b UPSTREAM: f2fs: clean up w/ fscrypt_is_bounce_page()
* 4205e8fd UPSTREAM: f2fs: prevent kernel warning due to negative i_nlink from corrupted image
* 74d87b5f UPSTREAM: f2fs: fix to do sanity check on sbi->total_valid_block_count
* 3a1ee29c BACKPORT: f2fs: support to disable linear lookup fallback
* 370cb16c UPSTREAM: f2fs: prevent the current section from being selected as a victim during GC
* db2ef83d UPSTREAM: f2fs: clean up unnecessary indentation
* 10405975 UPSTREAM: f2fs: fix to do sanity check on ino and xnid
* f6e89825 UPSTREAM: f2fs: add a fast path in finish_preallocate_blocks()
* 0973ac07 UPSTREAM: f2fs: zone: fix to avoid inconsistence in between SIT and SSA
* 70bc670f UPSTREAM: f2fs: fix to set atomic write status more clear
* 9af46e52 UPSTREAM: f2fs: remove redundant assignment to variable err
* 8e7a03dc ANDROID: iommu/pkvm-iommu: Fix locking in maple tree usage
* e6f1cbba ANDROID: KVM: arm64: Fix hyp_alloc(0)
* e365f699 ANDROID: KVM: Send VM availability FF-A direct messages to Trustzone
* 4a5a2ac2 UPSTREAM: PCI/pwrctrl: Cancel outstanding rescan work when unregistering
* 174f671d BACKPORT: binder: Create safe versions of binder log files
* d513ac52 UPSTREAM: binder: Refactor binder_node print synchronization
* 71516273 ANDROID: arm64: KVM: iommu: Fix range check for MMIO
* 413ed6ba ANDROID: iommu/arm-smmu-v3-kvm: Fix accidental domain ID freeing in free()
* f152c4b6 ANDROID: create initial empty aarch64 allowed breaks file
* 32d79853 FROMGIT: scsi: core: ufs: Fix a hang in the error handler
* e29203fd ANDROID: GKI: update symbol list for xiaomi
* 4f803158 ANDROID: GKI: Update symbol list for qcom
* 53e8841d ANDROID: Export the symbol of ext_sched_class
* 0f41effe ANDROID: GKI: add allowed list for Exynosauto SoC
* e9d50375 ANDROID: CONFIG_CRYPTO_SHA1_ARM64_CE=y to GKI and Microdroid kernel
* b4abcf44 ANDROID: qcom: Sort the ABI symbol list
* 9fc45b0a ANDROID: KVM: arm64: Deprecate lazy pte mappings for hyp modules
* 5d45bc0c ANDROID: KVM: arm64: Unmap host stage-2 memory on FF-A lend
* 7368dfbd ANDROID: KVM: arm64: Use the correct handle during ff-a transfer
* 66182cb2 ANDROID: ABI: Update pixel symbol list
* dc7c02e1 ANDROID: Export symbols for vendor hooks
* 5b56ab94 ANDROID: sched: Add vendor hook for util_fits_cpu
* 401be11d ANDROID: sched: Add trace_android_rvh_set_user_nice_locked
* 2ab16283 ANDROID: topology: Add vendor hook for use_amu_fie
* 12489712 ANDROID: Add new hook to enable overriding uclamp_validate()
* 390c2b42 ANDROID: sched: Add vendor hooks for override sugov behavior
* 3e15db3d ANDROID: sched: Add vendor hook for rt util update
* c6e18971 ANDROID: sched/rt: fix rt balance push
* bdad3fc9 ANDROID: qcom: Update the ABI symbol list
* 04458d99 ANDROID: KVM: arm64: Advertise support for FFA_RX_RELEASE
* 5498b5fe FROMGIT: mm: add CONFIG_PAGE_BLOCK_ORDER to select page block order
* 47d6161b ANDROID: GKI: update rtktv symbol
* 64307f88 FROMGIT: drm: writeback: Fix use after free in drm_writeback_connector_cleanup()
* 34052246 ANDROID: Update symbols list for imx
* 1c8ad988 UPSTREAM: rust: kbuild: do not export generated KASAN ODR symbols
* 30844cb9 ANDROID: Prune default dependencies for kernel_build
* bfd0a3a3 ANDROID: Allow spinlock, trap_handler and iommu for DDK pKVM modules
* cefce17a UPSTREAM: kcov: rust: add flags for KCOV with Rust

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