Subject: linux-next: manual merge of the ftrace tree with the jc_docs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 20 Aug 2021 14:02:30 +1000

Hi all,

Today's linux-next merge of the ftrace tree got a conflict in:

  MAINTAINERS

between commit:

  0c3b533cfdd5 ("MAINTAINERS: add entry for traditional Chinese documentation")

from the jc_docs tree and commit:

  db396be6ddc4 ("MAINTAINERS: Add an entry for os noise/latency")

from the ftrace tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 34cbc59bbea0,4268644cf86a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18921,14 -18798,20 +18921,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 <[email-masked]>
+ M:	Daniel Bristot de Oliveira <[email-masked]>
+ 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 <[email-masked]>
 +L:	[email-masked]
 +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 <[email-masked]>
  S:	Maintained