Merge branch arm64/for-next/sysreg into kvm-arm64/misc-5.15

Browse source

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>

...

This commit is contained in:

Marc Zyngier 2021-08-20 11:49:23 +01:00

parent 3134cc8beb 79d82cbcbb

commit 6e73bc90ec

2 changed files with 22 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

arch/arm64/include/asm/cpufeature.h

View file

28

arch/arm64/include/asm/sysreg.h

View file