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

[Stephen Rothwell]

Hi all,

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

  tools/testing/selftests/seccomp/seccomp_bpf.c

between commit:

  e4ab5ccc357b ("selftests/seccomp: Catch garbage on SECCOMP_IOCTL_NOTIF_RECV")

from Linus' tree and commit:

  589f6c054d7a ("selftests/seccomp: Catch garbage on SECCOMP_IOCTL_NOTIF_RECV")

from the kspp tree.

I fixed it up (I just used the version from Linus' tree as that seems
to have been committed later) 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: pgprLeinAfgul.pgp
Description: OpenPGP digital signature