]> 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)
commitf09354e5a2dc75b6a9d3fac5415e239499d62152
treeb1cca2cdf82acd5a25305ed2aa00290b6ccc6a42
parent259023f38e28a6e5dcfba17916e1a2e51558ae63
parentb5ad351dc44be69d3e95f620e427361ad9da6f65
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