* linux-next: manual merge of the userns tree with the net-next tree
@ 2016-09-23 4:51 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2016-09-23 4:51 UTC (permalink / raw)
To: Eric W. Biederman; +Cc: linux-next, linux-kernel, Dmitry Torokhov
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
include/linux/sysctl.h
between commit:
e79c6a4fc923 ("net: make net namespace sysctls belong to container's owner")
from the net-next tree and commit:
13bcc6a28534 ("sysctl: Stop implicitly passing current into sysctl_table_root.lookup")
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 include/linux/sysctl.h
index ecc3e07c6e63,f166ca0203e2..000000000000
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -158,11 -155,7 +158,10 @@@ struct ctl_table_set
struct ctl_table_root {
struct ctl_table_set default_set;
- struct ctl_table_set *(*lookup)(struct ctl_table_root *root,
- struct nsproxy *namespaces);
+ struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
+ void (*set_ownership)(struct ctl_table_header *head,
+ struct ctl_table *table,
+ kuid_t *uid, kgid_t *gid);
int (*permissions)(struct ctl_table_header *head, struct ctl_table *table);
};
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-23 4:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-23 4:51 linux-next: manual merge of the userns tree with the net-next tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox