Hi all,

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

  kernel/trace/ftrace.c

between commit:

  2a2d8c51defb ("ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()")

from Linus' tree and commit:

  8788ca164eb4 ("ftrace: Remove the legacy _ftrace_direct API")

from the ftrace tree.

I fixed it up (the latter removed the lines changed by the latter, so I
did that) 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