]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit89c8b9f4a7c12df7df884fb34d80bc70f8c7772e
tree792b10d96185da47d410539790dd5de234183d98
parent7879cf088716791472332e3109d3c5b112894326
parent19d89d3a72571dcfc36045c8d61737325af4bbc8
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