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.
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
