]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 672c0c5 2e29b99)
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)
Merge arm64's SME branch to resolve conflicts with the WFxT branch.

Signed-off-by: Marc Zyngier <maz@kernel.org>
1  2 
arch/arm64/Kconfig patch | diff1 | diff2 | blob | history
include/uapi/linux/elf.h patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/Kconfig
Simple merge
diff --cc include/uapi/linux/elf.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.