git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4b88524c47d7bffd5aaabf918c7759c74a1c577b
treeb1cca2cdf82acd5a25305ed2aa00290b6ccc6a42tree
parent672c0c5173427e6b3e2a9bbb7be51ceeec78093acommit | diff
parent2e29b9971ac54dec88baa58856a230ec2f2a2dffcommit | diff
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 diff1 | diff2 | blob | history
include/uapi/linux/elf.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.