]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Wed, 4 May 2022 08:38:32 +0000 (09:38 +0100)
committerMarc Zyngier <maz@kernel.org>
Wed, 4 May 2022 08:38:32 +0000 (09:38 +0100)
commita344812766a6ce996e46e68ea57b47a40833f6c9
treeb1cca2cdf82acd5a25305ed2aa00290b6ccc6a42
parent5b9aebe6c6a9cba90737cc0b7de46b1e312ef3ec
parent248378429f6dc36bb54cb5ee713a176717021162
Merge remote-tracking branch 'arm64/for-next/sme' into kvmarm-master/next

Merge arm64's SME branch to resolve conflicts with the WFxT branch.

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/Kconfig
include/uapi/linux/elf.h