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: 2cc84bbe ANDROID: iommu/arm-smmu-v3-kvm: Wrap around when writing to cmdq b32e32bf ANDROID: KVM: arm64: pviommu: Fix return value in __pkvm_use_dma_locked 42b01ce1 ANDROID: ABI: Update pixel symbol list 258557ef ANDROID: power: Add vendor hook for suspend 7a02c9f4 ANDROID: GKI: Update symbol list for vivo 79376c98 ANDROID: vendor_hooks: Add hook in try_to_unmap_one() 1a6d0710 ANDROID: vendor_hooks: Add hook in mmap_region() b165e16c ANDROID: vendor_hooks: Add hook in shrink_node_memcgs 8f5f6798 ANDROID: vendor_hooks: Add vendor hooks in __swap_writepage 7669d436 ANDROID: KVM: arm64: Remove args copy for direct FF-A calls 6ce196d4 ANDROID: Enable PKVM_STACKTRACE 265f4173 ANDROID: KVM: arm64: Remove DEBUG dependency to PKVM_STACKTRACE 3b1d8cc5 ANDROID: KVM: arm64: NVHE_EL2_DEBUG to PKVM_DEBUG menuconfig 58ca789e ANDROID: KVM: arm64: PROTECTED_NVHE_FTRACE to PKVM_FTRACE 386af809 ANDROID: KVM: arm64: PROTECTED_NVHE_STACKTRACE to PKVM_STACKTRACE 8b2a8f6b ANDROID: KVM: arm64: PROTECTED_NVHE_TESTING to PKVM_SELFTESTS b526a113 ANDROID: KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC e19e2557 ANDROID: KVM: arm64: Always resolve nvhe BUGs file and line 7bc24faa ANDROID: KVM: arm64: Add PKVM_STRICT_CHECKS 9cfa11e5 ANDROID: KVM: arm64: Add PKVM_DUMP_TRACE_ON_PANIC a3f61dba ANDROID: ring-buffer: Handle external writer reader_page fast-forward 10a77358 ANDROID: KVM: arm64: Allow relinqush for p-guest with huge-mappings 05a9e97a ANDROID: KVM: arm64: Use unmap for pKVM guests memory relinquish 024d995f ANDROID: KVM: arm64: Add hyp request SPLIT c8303029 ANDROID: KVM: arm64: Add host_split_guest for pKVM 2846906d ANDROID: KVM: arm64: Check for existing pinned_pages before THP in pkvm_mem_abort 2e30f9c5 ANDROID: KVM: arm64: Disable relinquish for p-guest huge-mappings 56ad021f ANDROID: KVM: arm64: Disallow #include trace.h for pKVM. f503b8a5 ANDROID: GKI: Add symbol to symbol list for vivo. 0142de08 ANDROID: vendor_hooks: add hooks to modify pageflags 22cf5307 ANDROID: gunyah: GKI: Fix the wrong return value in gunyah driver Change-Id: I64fde9df60b85399d6d98aed923b00a7430ae226 Signed-off-by:Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment