]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge branch arm64/for-next/cpufeature into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 23 Jan 2026 09:51:57 +0000 (09:51 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 23 Jan 2026 09:52:03 +0000 (09:52 +0000)
Merge arm64/for-next/cpufeature in to resolve conflicts resulting from
the removal of CONFIG_PAN.

* arm64/for-next/cpufeature:
  arm64: Add support for FEAT_{LS64, LS64_V}
  KVM: arm64: Enable FEAT_{LS64, LS64_V} in the supported guest
  arm64: Provide basic EL2 setup for FEAT_{LS64, LS64_V} usage at EL0/1
  KVM: arm64: Handle DABT caused by LS64* instructions on unsupported memory
  KVM: arm64: Add documentation for KVM_EXIT_ARM_LDST64B
  KVM: arm64: Add exit to userspace on {LD,ST}64B* outside of memslots
  arm64: Unconditionally enable PAN support
  arm64: Unconditionally enable LSE support
  arm64: Add support for TSV110 Spectre-BHB mitigation

Signed-off-by: Marc Zyngier <maz@kernel.org>
1  2 
arch/arm64/net/bpf_jit_comp.c

Simple merge