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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 12 Jun 2009 11:12:37 +1000

Hi Al,

On Wed, 27 May 2009 11:52:53 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the vfs tree got a conflict in
> fs/gfs2/ops_super.c between commit
> 9e6e0a128bca0a151d8d3fbd9459b22fc21cfebb ("GFS2: Merge mount.c and
> ops_super.c into super.c") from the gfs2 tree and commits
> 17af8f24a7750ea3d947904f97eb6dfacf9a88aa ("gfs2: remove ->write_super and
> stop maintaining ->s_dirt") and 8123178eb9ca12cde31a95170746e15a79528a62
> ("push BKL down into ->put_super") from the vfs tree.

This conflict is now against Linus's tree as the gfs2 tree has been
merged.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/