From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>,
Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the userns tree with the vfs tree
Date: Wed, 10 Dec 2014 17:21:43 +1100 [thread overview]
Message-ID: <20141210172143.2c218e27@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1565 bytes --]
Hi Eric,
Today's linux-next merge of the userns tree got conflicts in
include/linux/user_namespace.h and kernel/user.c between commit
435d5f4bb2cc ("common object embedded into various struct ....ns") from
the vfs tree and commit 2b714ea67ed4 ("userns: Add a knob to disable
setgroups on a per user namespace basis") from the userns tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/user_namespace.h
index 4cf06c140e21,6451c401dcf6..000000000000
--- a/include/linux/user_namespace.h
+++ b/include/linux/user_namespace.h
@@@ -27,7 -32,8 +33,8 @@@ struct user_namespace
int level;
kuid_t owner;
kgid_t group;
- unsigned int proc_inum;
+ struct ns_common ns;
+ unsigned long flags;
/* Register of per-UID persistent keyrings for this namespace */
#ifdef CONFIG_PERSISTENT_KEYRINGS
diff --cc kernel/user.c
index 69b800aebf13,2d09940c9632..000000000000
--- a/kernel/user.c
+++ b/kernel/user.c
@@@ -50,10 -50,8 +50,11 @@@ struct user_namespace init_user_ns =
.count = ATOMIC_INIT(3),
.owner = GLOBAL_ROOT_UID,
.group = GLOBAL_ROOT_GID,
- .proc_inum = PROC_USER_INIT_INO,
+ .ns.inum = PROC_USER_INIT_INO,
+#ifdef CONFIG_USER_NS
+ .ns.ops = &userns_operations,
+#endif
+ .flags = USERNS_INIT_FLAGS,
#ifdef CONFIG_PERSISTENT_KEYRINGS
.persistent_keyring_register_sem =
__RWSEM_INITIALIZER(init_user_ns.persistent_keyring_register_sem),
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-10 6:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-10 6:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-06-20 2:39 linux-next: manual merge of the userns tree with the vfs tree Stephen Rothwell
2018-08-06 7:50 ` Stephen Rothwell
2018-08-06 17:35 ` Eric W. Biederman
2018-06-20 1:44 Stephen Rothwell
2018-06-20 3:31 ` Stephen Rothwell
2018-06-19 4:56 Stephen Rothwell
2018-06-19 10:11 ` Eric W. Biederman
2015-05-25 9:49 Stephen Rothwell
2014-12-16 3:21 Stephen Rothwell
2014-12-16 4:40 ` Eric W. Biederman
2014-12-10 6:27 Stephen Rothwell
2013-11-08 6:50 Stephen Rothwell
2013-11-08 6:50 Stephen Rothwell
2013-11-08 6:49 Stephen Rothwell
2013-11-08 6:49 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141210172143.2c218e27@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox