Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1305790

Re: linux-next: manual merge of the vfs tree with the nsfd tree

Show all headers | 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

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