]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'arm64/for-next/core'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:14:34 +0000 (09:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:14:34 +0000 (09:14 +1000)
commitfa728d53b658384f0245a9ec6d8238f68d8878a5
treecb26f6e8e12da61cd7d15c9f093ae13c392052aa
parent4df5e7e53c45630303f116f80ad971d2c5c2b439
parent1e91a92b9af5289ff45c96075ea002c76b675574
Merge remote-tracking branch 'arm64/for-next/core'

# Conflicts:
# arch/arm64/include/asm/cpucaps.h
arch/arm64/Kconfig
arch/arm64/include/asm/cpucaps.h
arch/arm64/include/asm/word-at-a-time.h
arch/arm64/kernel/cpufeature.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/process.c
arch/arm64/kernel/stacktrace.c
arch/arm64/mm/mmu.c