linux-next: manual merge of the net-next tree with the nfsd-fixes tree

[Stephen Rothwell]

Hi all,

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

  include/trace/events/rpcgss.h

between commit:

  a4833e3abae1 ("SUNRPC: Fix rpcgss_context trace event acceptor field")

from the nfsd-fixes tree and commit:

  386f4a737964 ("trace: events: cleanup deprecated strncpy uses")

from the net-next tree.

I fixed it up (I just used the former version (which replaced the strncpy
with __assign_str) 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: pgpd10AoVXb40.pgp
Description: OpenPGP digital signature