linux-next: manual merge of the vfs tree with the nsfd tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with the nsfd tree
Date	2016-01-11 02:20 +0100
Message-ID	<qPzjl-3EA-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the vfs tree with the nsfd tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-11 02:20 +0100
  Re: linux-next: manual merge of the vfs tree with the nsfd tree "J. Bruce Fields" <bfields@fieldses.org> - 2016-01-11 04:00 +0100

csiph-web