Merge remote-tracking branch 'ftrace/for-next'

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index b7b8c87255aabf7860b92adf91cd9c2fd18882c9,4268644cf86a5b2871920f343a8b217cfc7e9c69..59e5550ded2fc12aae838a5719ae0bd17eb617d2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18968,14 -18798,20 +18968,28 @@@ F:        arch/x86/mm/testmmiotrace.
  F:    include/linux/mmiotrace.h
  F:    kernel/trace/trace_mmiotrace.c
  
+ TRACING OS NOISE / LATENCY TRACERS
+ M:    Steven Rostedt <rostedt@goodmis.org>
+ M:    Daniel Bristot de Oliveira <bristot@kernel.org>
+ S:    Maintained
+ F:    kernel/trace/trace_osnoise.c
+ F:    include/trace/events/osnoise.h
+ F:    kernel/trace/trace_hwlat.c
+ F:    kernel/trace/trace_irqsoff.c
+ F:    kernel/trace/trace_sched_wakeup.c
+ F:    Documentation/trace/osnoise-tracer.rst
+ F:    Documentation/trace/timerlat-tracer.rst
+ F:    Documentation/trace/hwlat_detector.rst
+ F:    arch/*/kernel/trace.c
+ 
 +TRADITIONAL CHINESE DOCUMENTATION
 +M:    Hu Haowen <src.res@email.cn>
 +L:    linux-doc-tw-discuss@lists.sourceforge.net
 +S:    Maintained
 +W:    https://github.com/srcres258/linux-doc
 +T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
 +F:    Documentation/translations/zh_TW/
 +
  TRIVIAL PATCHES
  M:    Jiri Kosina <trivial@kernel.org>
  S:    Maintained

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arc/Kconfig
Simple merge

diff --cc arch/arm/Kconfig
index 888060fd85272f36a141a96b224d3104bba05c1b,3564647283e13c3b5b57e807cb35d99d3eda1764..fc196421b2cedb5ecf92eaeff32bcd907a2399d8
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -124,7 -126,9 +124,8 @@@ config AR
        select PCI_SYSCALL if PCI
        select PERF_USE_VMALLOC
        select RTC_LIB
 -      select SET_FS
        select SYS_SUPPORTS_APM_EMULATION
+       select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
        # Above selects are sorted alphabetically; please add new ones
        # according to that.  Thanks.
        help

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/hexagon/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/nds32/Kconfig
Simple merge

diff --cc arch/nios2/Kconfig
Simple merge

diff --cc arch/openrisc/Kconfig
Simple merge

diff --cc arch/parisc/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/sh/Kconfig
Simple merge

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/um/Kconfig
index d02213e67895e278852d206e68152da2f3a87b56,0a699440c4c5dd967fec301be1a5cc6136acde6b..c18b45f75d41f7105de150734c09d42106fea8eb
--- 1/arch/um/Kconfig
--- 2/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@@ -22,8 -20,8 +22,9 @@@ config UM
        select GENERIC_CPU_DEVICES
        select HAVE_GCC_PLUGINS
        select SET_FS
+       select TRACE_IRQFLAGS_SUPPORT
        select TTY # Needed for line.c
 +      select HAVE_ARCH_VMAP_STACK
  
  config MMU
        bool

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc include/linux/trace_events.h
Simple merge

diff --cc kernel/trace/trace.c
Simple merge