]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'asm-generic/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:18:35 +0000 (09:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:18:35 +0000 (09:18 +1000)
commit1156f62ee47b84ace2718cc6b0cf88e1e8327704
treeca2370dfef504cf18597c6af19dcb9a5baca2bbd
parent3e1f03cc6209497e3e082ef24ed19bff80a3ee8b
parent8f76f9c46952659dd925c21c3f62a0d05a3f3e71
Merge remote-tracking branch 'asm-generic/master'

# Conflicts:
# include/asm-generic/bitops/non-atomic.h
15 files changed:
arch/alpha/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/ia64/Kconfig
arch/m68k/Kconfig
arch/mips/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/riscv/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/x86/Kconfig
arch/xtensa/Kconfig
include/asm-generic/bitops/non-atomic.h
lib/Kconfig