]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'ftrace/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:48:18 +0000 (11:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:48:18 +0000 (11:48 +1000)
commitac6b4c51b66f49a4c9f3ab6b9b730766776353b6
tree87ac7e81cfd0b038b11cecc160c7e7afe3aaf887
parente6fd2f7caa27dfe242940fba347d21f4de37ced5
parent297e1dcdca3d7f268ccfb175d0a3534bb9481303
Merge remote-tracking branch 'ftrace/for-next'

# Conflicts:
# MAINTAINERS
21 files changed:
MAINTAINERS
arch/Kconfig
arch/arc/Kconfig
arch/arm/Kconfig
arch/arm64/Kconfig
arch/hexagon/Kconfig
arch/mips/Kconfig
arch/nds32/Kconfig
arch/nios2/Kconfig
arch/openrisc/Kconfig
arch/parisc/Kconfig
arch/powerpc/Kconfig
arch/riscv/Kconfig
arch/s390/Kconfig
arch/sh/Kconfig
arch/sparc/Kconfig
arch/um/Kconfig
arch/x86/Kconfig
arch/xtensa/Kconfig
include/linux/trace_events.h
kernel/trace/trace.c