linux-next: manual merge of the ftrace tree with Linus' tree

[Stephen Rothwell]

Hi all,

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

  kernel/trace/trace.c

between commit:

  eecb91b9f98d ("tracing: Fix memleak due to race between current_tracer and trace")

from Linus' tree and commit:

  9182b519b8c9 ("tracing: Remove unnecessary copying of tr->current_trace")

from the ftrace tree.

I fixed it up (I just used the latter version - more may be
necessary?) 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

Attachment: pgpl0f_IaZBMK.pgp
Description: OpenPGP digital signature