From: Mark Brown <broonie@kernel.org>
To: "Eric W. Biederman" <ebiederman@twitter.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Miklos Szeredi <mszeredi@suse.cz>,
Miklos Szeredi <miklos@szeredi.hu>
Cc: Thierry Reding <thierry.reding@gmail.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the userns tree
Date: Sat, 19 Oct 2013 13:15:48 +0100 [thread overview]
Message-ID: <20131019121548.GX2443@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 710 bytes --]
Today's linux-next merge of the userns tree got a conflict in
fs/fuse/dir.c between 3c70b8eed (fuse: don't check_submounts_and_drop()
in RCU walk) in the fuse tree and 40216baa0 (vfs: Lazily remove mounts
on unlinked files and directories. v2) in the userns tree.
I fixed it up as below and can carry as required:
diff --cc fs/fuse/dir.c
index 0747f6e,b1cd7b7..0000000
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@@ -263,9 -259,7 +263,10 @@@ out
invalid:
ret = 0;
- shrink_submounts_and_drop(entry);
+
- if (!(flags & LOOKUP_RCU) && check_submounts_and_drop(entry) != 0)
- ret = 1;
++ if (!(flags & LOOKUP_RCU))
++ shrink_submounts_and_drop(entry);
++
goto out;
}
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-10-19 12:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-19 12:15 Mark Brown [this message]
2013-10-19 23:47 ` linux-next: manual merge of the userns tree Eric W. Biederman
-- strict thread matches above, loose matches on Subject: below --
2008-11-05 5:33 Stephen Rothwell
2008-11-05 11:49 ` David Howells
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=20131019121548.GX2443@sirena.org.uk \
--to=broonie@kernel.org \
--cc=ebiederm@xmission.com \
--cc=ebiederman@twitter.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=mszeredi@suse.cz \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).