* linux-next: manual merge of the vfs tree with the nsfd tree
@ 2016-01-11 1:16 Stephen Rothwell
2016-01-11 2:59 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2016-01-11 1:16 UTC (permalink / raw)
To: Al Viro, J. Bruce Fields; +Cc: linux-next, linux-kernel, NeilBrown
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
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the vfs tree with the nsfd tree
2016-01-11 1:16 linux-next: manual merge of the vfs tree with the nsfd tree Stephen Rothwell
@ 2016-01-11 2:59 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2016-01-11 2:59 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Al Viro, linux-next, linux-kernel, NeilBrown
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-11 2:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-11 1:16 linux-next: manual merge of the vfs tree with the nsfd tree Stephen Rothwell
2016-01-11 2:59 ` J. Bruce Fields
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox