Subject: linux-next: manual merge of the pidfd tree with the kspp tree

From: Stephen Rothwell <[email-masked]>
Date: Sun, 21 Jun 2020 22:43:22 +1000

Hi all,

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

  fs/file.c

between commit:

  d3868eea5cbc ("fs: Move __scm_install_fd() to __fd_install_received()")

from the kspp 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 9568bcfd1f44,340bc9569f9d..000000000000
--- a/fs/file.c
+++ b/fs/file.c
@@@ -10,8 -10,8 +10,9 @@@
  #include <linux/syscalls.h>
  #include <linux/export.h>
  #include <linux/fs.h>
+ #include <linux/kernel.h>
  #include <linux/mm.h>
 +#include <linux/net.h>
  #include <linux/sched/signal.h>
  #include <linux/slab.h>
  #include <linux/file.h>
@@@ -19,8 -19,7 +20,9 @@@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
 +#include <net/cls_cgroup.h>
 +#include <net/netprio_cgroup.h>
+ #include <linux/close_range.h>
  
  unsigned int sysctl_nr_open __read_mostly = 1024*1024;
  unsigned int sysctl_nr_open_min = BITS_PER_LONG;