From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>,
Jens Axboe <axboe@kernel•dk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tejun Heo <tj@kernel•org>
Subject: linux-next: manual merge of the userns tree with the block tree
Date: Wed, 3 Jun 2015 18:46:48 +1000 [thread overview]
Message-ID: <20150603184648.6d2481e1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in
include/linux/fs.h between commit 89e9b9e07a39 ("writeback: add
{CONFIG|BDI_CAP|FS}_CGROUP_WRITEBACK") from the block tree and commit
1b852bceb0d1 ("mnt: Refactor the logic for mounting sysfs and proc in a
user namespace") 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/fs.h
index fe0dcaa3a789,571aab91bfc0..000000000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -1913,7 -1897,7 +1913,8 @@@ struct file_system_type
#define FS_HAS_SUBTYPE 4
#define FS_USERNS_MOUNT 8 /* Can be mounted by userns root */
#define FS_USERNS_DEV_MOUNT 16 /* A userns mount does not imply MNT_NODEV */
- #define FS_CGROUP_WRITEBACK 32 /* Supports cgroup-aware writeback */
+ #define FS_USERNS_VISIBLE 32 /* FS must already be visible */
++#define FS_CGROUP_WRITEBACK 64 /* Supports cgroup-aware writeback */
#define FS_RENAME_DOES_D_MOVE 32768 /* FS will handle d_move() during rename() internally. */
struct dentry *(*mount) (struct file_system_type *, int,
const char *, void *);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-06-03 8:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 8:46 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 7:45 linux-next: manual merge of the userns tree with the block tree 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=20150603184648.6d2481e1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tj@kernel$(echo .)org \
/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