OSDN Git Service

Merge branch arm64/for-next/sysreg into kvm-arm64/misc-5.15
authorMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 10:49:23 +0000 (11:49 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 10:49:23 +0000 (11:49 +0100)
commit6e73bc90ec447b8fcec5fd22fa49e100f3b4f909
tree792b10d96185da47d410539790dd5de234183d98
parent3134cc8beb69d0db9de651081707c4651c011621
parent79d82cbcbb3d2a56c009ad6a6df92c5dee061dad
Merge branch arm64/for-next/sysreg into kvm-arm64/misc-5.15

Merge the arm64/for-next/sysreg branch to avoid merge conflicts
in -next and upstream.

* arm64/for-next/sysreg:
  arm64/kexec: Test page size support with new TGRAN range values

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/sysreg.h