lkml.org 
[lkml]   [2016]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the vfs tree with the nsfd tree
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

\
 
 \ /
  Last update: 2016-01-11 02:41    [W:1.288 / U:0.500 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site