Hi all,

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

  kernel/trace/Kconfig

between commit:

  25e4e3565d45 ("ftrace: Introduce FTRACE_OPS_FL_JMP")

from the bpf-next tree and commit:

  f93a7d0caccd ("ftrace: Allow tracing of some of the tracing code")

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 kernel/trace/Kconfig
index 4661b9e606e0,e1214b9dc990..000000000000
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@@ -336,12 -330,20 +336,26 @@@ config DYNAMIC_FTRACE_WITH_ARG
  	depends on DYNAMIC_FTRACE
  	depends on HAVE_DYNAMIC_FTRACE_WITH_ARGS
  
 +config DYNAMIC_FTRACE_WITH_JMP
 +	def_bool y
 +	depends on DYNAMIC_FTRACE
 +	depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS
 +	depends on HAVE_DYNAMIC_FTRACE_WITH_JMP
 +
+ config FUNCTION_SELF_TRACING
+ 	bool "Function trace tracing code"
+ 	depends on FUNCTION_TRACER
+ 	help
+ 	  Normally all the tracing code is set to notrace, where the function
+ 	  tracer will ignore all the tracing functions. Sometimes it is useful
+ 	  for debugging to trace some of the tracing infratructure itself.
+ 	  Enable this to allow some of the tracing infrastructure to be traced
+ 	  by the function tracer. Note, this will likely add noise to function
+ 	  tracing if events and other tracing features are enabled along with
+ 	  function tracing.
+ 
+ 	  If unsure, say N.
+ 
  config FPROBE
  	bool "Kernel Function Probe (fprobe)"
  	depends on HAVE_FUNCTION_GRAPH_FREGS && HAVE_FTRACE_GRAPH_FUNC