linux-next: manual merge of the tip tree with the jc_docs tree

[Stephen Rothwell]

Hi all,

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

  samples/kprobes/kprobe_example.c

between commits:

  61fa308f23b5 ("samples/kprobes: Fix typo in handler_fault()")
  db1ea668843e ("samples/kprobes: Fix typo in handler_post()")

from the jc_docs tree and commit:

  ec6aba3d2be1 ("kprobes: Remove kprobe::fault_handler")

from the tip tree.

I fixed it up (the latter removed some code updated by the former) 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: pgp3YO1RD1vbv.pgp
Description: OpenPGP digital signature