Commit 3b4c9871 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Giuliano Procida
Browse files

Merge branch 'android15-6.6' into branch 'android15-6.6-lts'



This catches the android15-6.6-lts branch up with a lot of abi additions
and other changes in the android15-6.6 branch.  Included in here are the
following commits:

* 41bf0d82 ANDROID: Use -fomit-frame-pointer for x86_ptrace_syscall_x86_64
* b7c3d209 ANDROID: GKI: Swap Allocator ABI Fixup
* 7cbe80f0 FROMLIST: BACKPORT: mm: swap: mTHP allocate swap entries from nonfull list
* 96836d4f FROMLIST: BACKPORT: mm: swap: swap cluster switch to double link list
* 2b24dd9d Revert "FROMLIST: BACKPORT: mm: swap: swap cluster switch to double link list"
* 887a20b6 Revert "FROMLIST: BACKPORT: mm: swap: mTHP allocate swap entries from nonfull list"
* d24fe223 Revert "ANDROID: ABI: mm: swap: reserve cluster according to mount option."
* 0cd41fbf UPSTREAM: erofs: fix uninitialized page cache reported by KMSAN
* 7341712c ANDROID: oplus: Update the ABI xml and symbol list
* ffb16366 ANDROID: vendor_hooks: Add hook for fsnotify
* 59717f94 ANDROID: ABI: update galaxy symbol list
* 49706772 ANDROID: net: export symbol for tracepoint_consume_skb
* f50d0485 ANDROID: ABI: update symbol list for galaxy
* 89d387d9 ANDROID: memcg: add vendor hook to use vm_swappiness
* cebdeae2 ANDROID: ABI: update symbol list for galaxy
* 371517c5 ANDROID: mm: add vendor hook to tune warn_alloc
* 830cfc7a ANDROID: ABI: update symbol list for galaxy
* 3a6f6351 ANDROID: mm: add vendor hook in alloc_contig_range()
* 57525260 ANDROID: ABI: update symbol list for galaxy
* 969cecdd ANDROID: mm: export tracepoint vm_unmapped_area
* ac1de794 ANDROID: gfp: add __GFP_CMA in __def_gfpflag_names
* b983c75e ANDROID: ABI: update symbol list for galaxy
* c6ba1fd4 ANDROID: cma: add vendor hook for cma_debug_show_areas
* 2ca27754 ANDROID: ABI: update symbol list for galaxy
* 0bd33fde ANDROID: mm: add vendor hook for __alloc_pages_slowpath()
* 35cf4d8e ANDROID: ABI: Update pixel symbol list
* 46f2aacf ANDROID: ABI: Update symbol list for Qcom
* cd83afb4 ANDROID: ABI: Update pixel symbol list
* 0935fda8 ANDROID: Export raise_softirq
* 4816d3f1 FROMGIT: media: amphion: Report the average QP of current encoded frame
* a9cf95c8 FROMGIT: media: amphion: Remove lock in s_ctrl callback
* fadc0ed1 FROMGIT: media: v4l2-ctrls: Add average QP control
* 075954d0 ANDROID: GKI: Update qcom symbol list
* 0fc8eacf ANDROID: KVM: arm64: Fix state masking in guest_request_walker()
* a8759911 ANDROID: ABI: Update symbol list for galaxy
* 0a53bc59 ANDROID: abi_gki_aarch64_qcom: Add configfs abi symbol
* 6b40f68e ANDROID: Update symbol list for mtk
* 9ca99e65 ANDROID: GKI: Update symbol list for Amlogic
* 9443f1fa ANDROID: GKI: update symbol list for unisoc
* 48509bef UPSTREAM: drm/drm_file: Fix pid refcounting race
* 8fd0ab95 ANDROID: ABI: Update symbol list for galaxy
* 43b4adb9 ANDROID: mm: add vendor hook in vmscan.c
* dd071677 ANDROID: GKI: Update symbol list for vivo
* c4db1689 ANDROID: GKI: net: add vendor hooks net qos for gki purpose
* 359c132b ANDROID: GKI: update symbol list file for xiaomi
* 84dfc405 ANDROID: abi_gki_aarch64_qcom: Add Tegra Symbols
* 8c8ee78f ANDROID: ABI: Update symbol list for galaxy
* 16fd47ba ANDROID: GKI: Update QCOM symbol list
* b0acaed2 ANDROID: arm64: Allow non granule aligned MMIO guard requests
* bc028c90 ANDROID: gunyah: Add support for tracking Guest VM run time
* 2182ee63 ANDROID: GKI: update xiaomi symbol list
* 885dc76e ANDROID: KVM: arm64: Fix pKVM mod hyp events lookup
* fcbb7a1d ANDROID: GKI: Add initialization for mutex oem_data.
* 1efd61a1 ANDROID: GKI: Update symbol list for vivo
* d2a7ba06 ANDROID: vendor_hooks: add vendor hooks for readahead bio
* 57bfc45d ANDROID: ABI: Update symbol list for galaxy
* 6589977c ANDROID: mm: add vendor hooks in psi.c
* 14d4f8f7 ANDROID: ABI: Update symbol list for galaxy
* 9db4e989 ANDROID: mm: add vendor hooks in madvise for swap entry
* 970642eb ANDROID: ABI: Update symbol list for galaxy
* 66c7ba20 ANDROID: dma-buf: add dma_heap_try_get_pool_size_kb for vendor hook
* d4474bdd ANDROID: KVM: arm64: Consolidate allowed and restricted guest cpu feature checks
* c7b8a41d ANDROID: android: Add symbols to debug_symbols driver
* 674cbcb7 ANDROID: abi_gki_aarch64_vivo: Update symbol list
* b0807745 ANDROID: mm: add vendor hooks to adjust memory reclamation
* 6d955b09 ANDROID: GKI: Add symbol to symbol list for vivo.
* e41b8e8e ANDROID: vendor_hooks: add hooks in prctl_set_vma
* fb3f4037 UPSTREAM: usb: dwc3: core: Workaround for CSR read timeout
* c867ece9 UPSTREAM: f2fs: fix to force buffered IO on     inline_data inode
* 3efb7c2d ANDROID: GKI: Add symbol to symbol list for imx
* e24990b2 UPSTREAM: net: usb: ax88179_178a: improve reset check
* 9f53a5ac UPSTREAM: net: usb: ax88179_178a: fix link status when link is set to down/up
* 8a43f59a ANDROID: Reapply: "net: usb: ax88179_178a: avoid writing the mac address before first reading"
* 29168807 ANDROID: f2fs: enable cleancache
* f9df4661 ANDROID: KVM: Update nVHE stack size to 8KB
* 6e716f19 UPSTREAM: arm64: Add USER_STACKTRACE support
* aaca6b10 ANDROID: GKI: Add initialization for rwsem's oem_data and vendor_data.
* 1036ce8d ANDROID: GKI: Update symbols to symbol list for honor
* bb4dd28c ANDROID: Update the ABI representation
* da5b4386 BACKPORT: FROMLIST: dm-verity: improve performance by using multibuffer hashing
* 6c33cbb4 BACKPORT: FROMLIST: dm-verity: reduce scope of real and wanted digests
* 3503ed6f FROMLIST: dm-verity: hash blocks with shash import+finup when possible
* 3ed9f239 BACKPORT: FROMLIST: dm-verity: make verity_hash() take dm_verity_io instead of ahash_request
* 33bfa574 BACKPORT: FROMLIST: dm-verity: always "map" the data blocks
* 901b6a15 FROMLIST: dm-verity: provide dma_alignment limit in io_hints
* a9368609 FROMLIST: dm-verity: make real_digest and want_digest fixed-length
* 7958bb4e BACKPORT: FROMLIST: dm-verity: move data hash mismatch handling into its own function
* 76fed9f0 BACKPORT: FROMLIST: dm-verity: move hash algorithm setup into its own function
* abed1a5d FROMLIST: fsverity: improve performance by using multibuffer hashing
* 08600b5d FROMLIST: crypto: arm64/sha256-ce - add support for finup_mb
* 16e22de4 FROMLIST: crypto: x86/sha256-ni - add support for finup_mb
* a2372f60 FROMLIST: crypto: testmgr - add tests for finup_mb
* 17f53e8a FROMLIST: crypto: testmgr - generate power-of-2 lengths more often
* 614beb21 BACKPORT: FROMLIST: crypto: shash - add support for finup_mb
* 9c58b7c1 UPSTREAM: fsverity: remove hash page spin lock
* 627ec822 UPSTREAM: crypto: arm64/sha2-ce - clean up backwards function names
* b6284a70 UPSTREAM: crypto: arm64/sha2-ce - implement ->digest for sha256
* 1725496f UPSTREAM: crypto: x86/sha256 - implement ->digest for sha256
* 2414c5e0 UPSTREAM: erofs: ensure m_llen is reset to 0 if metadata is invalid
* 2a09862b ANDROID: Add thermal headers to aarch64 allowlist
* 1bf09fb4 ANDROID: ABI: Update pixel symbol list
* 4d6aca02 ANDROID: GKI: Update lenovo symbol list
* 0347be8c ANDROID: rust: disable floating point target features
* 96ba0966 ANDROID: ABI: Update oplus symbol list
* 84e4882c UPSTREAM: mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL
* 5a875d70 FROMGIT: KVM: arm64: nVHE: Support CONFIG_CFI_CLANG at EL2
* f3cc12e6 FROMGIT: KVM: arm64: Introduce print_nvhe_hyp_panic helper
* ad4668a0 FROMGIT: arm64: Introduce esr_brk_comment, esr_is_cfi_brk
* 546ea288 FROMGIT: KVM: arm64: VHE: Mark __hyp_call_panic __noreturn
* 57d9ce55 FROMGIT: KVM: arm64: nVHE: gen-hyprel: Skip R_AARCH64_ABS32
* 406d5af4 FROMGIT: KVM: arm64: nVHE: Simplify invalid_host_el2_vect
* 9dd9c0ec FROMGIT: KVM: arm64: Fix __pkvm_init_switch_pgd call ABI
* 16302047 FROMGIT: KVM: arm64: Fix clobbered ELR in sync abort/SError
* 2fe13818 ANDROID: KVM: Reduce upstream diff for kaslr_off
* 30068fa3 Revert "FROMLIST: KVM: arm64: Fix clobbered ELR in sync abort/SError"
* 0bbdca2e Revert "FROMLIST: KVM: arm64: Fix __pkvm_init_switch_pgd C signature"
* 16b7f3f9 Revert "FROMLIST: KVM: arm64: Pass pointer to __pkvm_init_switch_pgd"
* 386f5164 Revert "FROMLIST: KVM: arm64: nVHE: Remove __guest_exit_panic path"
* 5f4a702e Revert "FROMLIST: KVM: arm64: nVHE: Add EL2h sync exception handler"
* ff1e4507 Revert "FROMLIST: KVM: arm64: nVHE: gen-hyprel: Skip R_AARCH64_ABS32"
* fe72c7b6 Revert "FROMLIST: KVM: arm64: VHE: Mark __hyp_call_panic __noreturn"
* b6e7c9eb Revert "FROMLIST: arm64: Move esr_comment() to <asm/esr.h>"
* 5456aa91 Revert "BACKPORT: FROMLIST: KVM: arm64: nVHE: Support CONFIG_CFI..."
* c876dae4 ANDROID: ABI: Update pixel symbol list
* a8f26ab3 ANDROID: ABI: Update kvm_hyp_iommu ABI
* 740a179b ANDROID: KVM: arm64: deduplicate kvm_hyp_iommu
* 691810c3 ANDROID: Makefile: Fail the build if RUST and CFI are both enabled
* 437e699e ANDROID: KVM: arm64: Fix psci_mem_protect_dec() on VM reclaim
* 013c5ddc ANDROID: rust_binder: fix leak of name in binderfs
* 0dcde403 Revert "ANDROID: scsi: ufs: Add hook to influence the UFS clock scaling policy"
* c573b859 Revert "ANDROID: sched: Add vendor hook for update_load_sum"
* 22f0a582 Revert "ANDROID: PM / Domains: add vendor_hook to disallow domain idle state"
* 80833112 ANDROID: ABI: Export kvm_iommu_flush_unmap_cache
* 21f52823 ANDROID: KVM: arm64: iommu: Allow driver to flush cached refcount
* 65ea1176 ANDROID: KVM: arm64: iommu: Fix map_pages() error path
* dbc350cb ANDROID: GKI: Update lenovo symbol list
* 1cefa59a Revert "ANDROID: vendor_hooks: Add hook for mmc queue"
* 48f130c1 Revert "ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle"
* 142c5838 FROMLIST: binder_alloc: Replace kcalloc with kvcalloc to mitigate OOM issues
* 9dc982c2 ANDROID: Update the ABI symbol list: set_normalized_timespec64
* 6f22fc65 ANDROID: GKI: Update qcom symbol list
* eb1f7db0 ANDROID: fix kernelci GCC builds of fips140.ko
* d4103f93 ANDROID: GKI: add a parameter to vh_blk_fill_rwbs
* e763f6a5 UPSTREAM: sched/fair: Use all little CPUs for CPU-bound workloads
* 2b640be5 ANDROID: GKI: update symbol list for honor
* 0e8d838f FROMLIST: locking/rwsem: Add __always_inline annotation to __down_write_common() and inlined callers
* fea3a332 ANDROID: ABI: Update pixel symbol list
* 0db446aa ANDROID: abi_gki_aarch64_qcom: Add v4l2 abi symbol
* d2da2d32 ANDROID: ABI: Update QCOM symbol list
* 145f51ac ANDROID: fips140: remove unnecessary no_sanitize(cfi)
* 45688919 ANDROID: GKI: Add whitelist related to runtime energy model
* 79591eba ANDROID: sched/psi: disable the privilege check if CONFIG_DEFAULT_SECURITY_SELINUX is enabled
* 5f59226f ANDROID: Update the ABI symbol list
* ba91ea85 ANDROID: scheduler: add vendor-specific wake flag
* df27fe0b ANDROID: Update the ABI symbol list
* aca2287a FROMGIT: erofs: fix possible memory leak in z_erofs_gbuf_exit()
* 412548f4 BACKPORT: erofs: add a reserved buffer pool for lz4 decompression
* 43b3f34c BACKPORT: erofs: do not use pagepool in z_erofs_gbuf_growsize()
* 5084a99b BACKPORT: erofs: rename per-CPU buffers to global buffer pool and make it configurable
* c69d9eca BACKPORT: erofs: rename utils.c to zutil.c
* 2d68f6d5 BACKPORT: erofs: relaxed temporary buffers allocation on readahead
* 85f00ea4 ANDROID: Limit vfs-only namespace to GKI builds
* 4b9c4f5f ANDROID: ABI: Update symbol list for OPLUS
* 2435f324 FROMGIT: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
* 9cb7fd9a ANDROID: GKI: Update symbol list for Amlogic
* d14189b6 FROMGIT: f2fs: clean up set REQ_RAHEAD given rac
* 2f4e6b1d ANDROID: Disable warning about new bindgen
* a10b25b5 ANDROID: ABI: Update symbol list for Exynos SoC
* 3396c213 ANDROID: rust: use target.json for aarch64
* 1656e8d9 ANDROID: rust: rustfmt scripts/generate_rust_target.rs
* 8d2c3377 ANDROID: GKI: update symbol list for lenovo
* 791cea94 ANDROID: GKI: add a vendor hook in cpufreq_online
* ddf8bd08 ANDROID: abi_gki_aarch64_qcom: update abi symbols
* 44045194 ANDROID: Revert^3 "ANDROID: Enable Rust Binder Module"
* 512a729c ANDROID: ABI: Update pixel symbol list
* 324b653e ANDROID: scsi: ufs: add complete init vendor hook
* 0c09faf9 ANDROID: scsi: ufs: add vendor hook to override key reprogramming
* b5f875e6 ANDROID: GKI: Update Honor abi symbol list
* 6137bb28 ANDROID: GKI: Add hooks for sk_alloc.
* 27547c6a ANDROID: GKI: Update lenovo symbol list
* 0383c457 ANDROID: GKI: Export css_task_iter_start()
* d8755d12 ANDROID: thermal: Fix cases for vendor hook function not accounted correctly
* 23f02fa4 ANDROID: GKI: Update symbol list for xiaomi
* d2b35f36 ANDROID: vendor_hooks: export cgroup_threadgroup_rwsem
* 95c7d8e9 FROMLIST: mm: fix incorrect vbq reference in purge_fragmented_block
* 28866756 ANDROID: GKI: Update symbol list for vivo
* c996e104 ANDROID: GKI: Modify the RWBS_LEN for blk_fill_rwbs
* 0dd775b3 ANDROID: GKI: add vendor hooks for blk_fill_rwbs
* 32721ad0 ANDROID: GKI: Update symbol list for Amlogic
* 05a1f393 ANDROID: mm: allow hooks into free_pages_prepare()
* 379c8853 ANDROID: mm: allow hooks into __alloc_pages()
* 6d28431b FROMLIST: selftests/vDSO: fix clang build errors and warnings
* 06948289 FROMLIST: selftests/timers: Guard LONG_MAX / LONG_MIN defines
* 4141052d ANDROID: GKI: Update symbol list for vivo
* cdb09f7e ANDROID: vendor hooks: add vendor hooks for do_new_mount
* 5bfee09a ANDROID: GKI: Export tracepoint tcp_retransmit_skb

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