Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1305790
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | "J. Bruce Fields" <bfields@fieldses.org> |
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the vfs tree with the nsfd tree |
| Date | Mon, 11 Jan 2016 04:00:02 +0100 |
| Message-ID | <qPAS6-4ya-17@gated-at.bofh.it> (permalink) |
| References | <qPzjl-3EA-9@gated-at.bofh.it> |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=us-ascii |
| Content-Disposition | inline |
| User-Agent | Mutt/1.5.21 (2010-09-15) |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 23 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | Al Viro <viro@ZenIV.linux.org.uk>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, NeilBrown <neilb@suse.de> |
| X-Original-Date | Sun, 10 Jan 2016 21:59:18 -0500 |
| X-Original-Message-ID | <20160111025918.GB25396@fieldses.org> |
| X-Original-References | <20160111121632.26fd5873@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1305790 |
Show key headers only | View raw
On Mon, Jan 11, 2016 at 12:16:32PM +1100, Stephen Rothwell wrote:
> 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).
Thanks, I've dropped my version.
--b.
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the vfs tree with the nsfd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-11 02:20 +0100 Re: linux-next: manual merge of the vfs tree with the nsfd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-11 04:00 +0100
csiph-web