linux-next: manual merge of the userns tree with the origin tree

linux-next: manual merge of the userns tree with the origin tree

[Stephen Rothwell]

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

Hi all,

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

  kernel/ucount.c

between commit:

  5b8fea65d197 ("fanotify: configurable limits via sysfs")

from the origin tree and commits:

  21d1c5e386bc ("Reimplement RLIMIT_NPROC on top of ucounts")
  6e52a9f0532f ("Reimplement RLIMIT_MSGQUEUE on top of ucounts")
  d64696905554 ("Reimplement RLIMIT_SIGPENDING on top of ucounts")
  d7c9e99aee48 ("Reimplement RLIMIT_MEMLOCK on top of ucounts")

from the userns 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 kernel/ucount.c
index 8d8874f1c35e,df84a2a63926..000000000000
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@@ -73,11 -79,11 +79,15 @@@ static struct ctl_table user_table[] = 
  #ifdef CONFIG_INOTIFY_USER
  	UCOUNT_ENTRY("max_inotify_instances"),
  	UCOUNT_ENTRY("max_inotify_watches"),
 +#endif
 +#ifdef CONFIG_FANOTIFY
 +	UCOUNT_ENTRY("max_fanotify_groups"),
 +	UCOUNT_ENTRY("max_fanotify_marks"),
  #endif
+ 	{ },
+ 	{ },
+ 	{ },
+ 	{ },
  	{ }
  };
  #endif /* CONFIG_SYSCTL */

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