linux-next: manual merge of the kspp-gustavo tree with the ftrace tree

[Stephen Rothwell]

Hi all,

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

  include/linux/ftrace.h

between commit:

  34cdd18b8d24 ("tracing: Use linker magic instead of recasting ftrace_ops_list_func()")

from the ftrace tree and commit:

  c45ede6c2781 ("ftrace: Fix -Wmissing-prototypes errors")

from the kspp-gustavo tree.

I fixed it up (I just used the former version) 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: pgpseeXuV4cS1.pgp
Description: OpenPGP digital signature