From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>,
"J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
NeilBrown <neilb@suse.de>
Subject: linux-next: manual merge of the vfs tree with the nsfd tree
Date: Mon, 11 Jan 2016 12:16:32 +1100 [thread overview]
Message-ID: <20160111121632.26fd5873@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/namei.c
between commit:
1932ac9d7cef ("nfsd: don't hold i_mutex over userspace upcalls")
from the nfsd tree and commit:
bbddca8e8fac ("nfsd: don't hold i_mutex over userspace upcalls")
from the vfs tree.
Similar patch, but slightly different. :-(
I fixed it up (I used the vfs tree version) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
next reply other threads:[~2016-01-11 1:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 1:16 Stephen Rothwell [this message]
2016-01-11 2:59 ` linux-next: manual merge of the vfs tree with the nsfd tree J. Bruce Fields
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=20160111121632.26fd5873@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bfields@fieldses.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=neilb@suse.de \
--cc=viro@ZenIV.linux.org.uk \
/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).