Merge remote-tracking branch 'arm64/for-next/sysregs' into kvm-arm64/fgt-rework

Browse source

Add shared arm64/for-next/sysregs branch to deal with conflict resolution.

Signed-off-by: Marc Zyngier <maz@kernel.org>

...

This commit is contained in:

Marc Zyngier 2023-12-18 09:19:35 +00:00

parent 2cc14f52ae 4ebee8cebd

commit e32afede68

2 changed files with 329 additions and 11 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

20

arch/arm64/include/asm/sysreg.h

View file

320

arch/arm64/tools/sysreg

View file