Messages in this thread | | | Date | Sun, 22 Feb 2015 11:57:55 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with Linus' tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/nfs/write.c between commit d15bc38df607 ("nfs: Provide and use helper functions for marking a page as unstable") 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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |