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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the vfs tree with the nfs tree
Date	2016-01-11 02:20 +0100
Message-ID	<qPzjk-3EA-3@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/nfs/nfs4file.c

between commit:

  926ea40a7ee2 ("NFSv4: Fix a compile warning about no prototype for nfs4_ioctl()")

from the nfs tree and commit:

  04b38d601239 ("vfs: pull btrfs clone API to vfs layer")

from the vfs tree.

I fixed it up (the latter removed the code fixed in the former) 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 | Find similar | Unroll thread

Thread

linux-next: manual merge of the vfs tree with the nfs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-01-11 02:20 +0100

csiph-web