Re: linux-next: manual merge of the vfs tree with the nsfd tree
From: J. Bruce Fields
Date: Sun Jan 10 2016 - 21:59:25 EST
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:
> 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.