Messages in this thread | | | Date | Mon, 11 Jan 2016 12:16:32 +1100 | From | Stephen Rothwell <> | Subject | linux-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
| |