linux-next: manual merge of the pidfd tree with the seccomp tree

linux-next: manual merge of the pidfd tree with the seccomp tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]

Hi all,

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

  fs/file.c

between commit:

  21fec66fd4be ("fs: Move __scm_install_fd() to __receive_fd()")

from the seccomp tree and commit:

  60997c3d45d9 ("close_range: add CLOSE_RANGE_UNSHARE")

from the pidfd tree.

I fixed it up (see below) 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

diff --cc fs/file.c
index 4fb111735d1d,340bc9569f9d..000000000000
--- a/fs/file.c
+++ b/fs/file.c
@@@ -18,7 -19,7 +19,8 @@@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
 +#include <net/sock.h>
+ #include <linux/close_range.h>
  
  unsigned int sysctl_nr_open __read_mostly = 1024*1024;
  unsigned int sysctl_nr_open_min = BITS_PER_LONG;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]