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

[Stephen Rothwell]

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/gfs2/ops_inode.c between commit
83c77e8b3457f2ee5dad028dc54cf3ce540104b2 ("GFS2: Fix refcnt leak on
gfs2_follow_link() error path") from the gfs2 tree and commit
261a144ac2b3867c7be70f08925e446430df6937 ("Switch gfs2 to nd_set_link()")
from the vfs tree.

I can't figure out if the gfs2 tree fix is required any more, so I just
used the vfs tree version.

Al, if that gfs2 patch is standalone, you should probably send it to the
gfs2 guys.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature