linux-next: manual merge of the vfs tree with Linus' tree
From: Stephen Rothwell
Date: Sat Feb 21 2015 - 19:52:11 EST
Today's linux-next merge of the vfs tree got a conflict in
fs/nfs/filelayout/filelayout.c between commit 338d00cfef07 ("pnfs:
Refactor the *_layout_mark_request_commit to use
pnfs_layout_mark_request_commit") from Linus' tree and commit
d92dd5c34974 ("VFS: (Scripted) Convert ->d_inode to fs_inode() in
fs/nfs/") from the vfs tree.
I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature