From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Steven Whitehouse <swhiteho@redhat.com>,
Christoph Hellwig <hch@infradead.org>
Subject: Re: linux-next: manual merge of the vfs tree with the gfs2 tree
Date: Fri, 12 Jun 2009 02:19:48 +0100 [thread overview]
Message-ID: <20090612011948.GZ8633@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20090612111237.0e5972e9.sfr@canb.auug.org.au>
On Fri, Jun 12, 2009 at 11:12:37AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> On Wed, 27 May 2009 11:52:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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.
I know, properly ported stuff is in updated for-next (basically, a bunch
of functions moved from ops_super.c to super.c, so changesets needed to
be updated to touch the latter).
next prev parent reply other threads:[~2009-06-12 1:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-27 1:52 linux-next: manual merge of the vfs tree with the gfs2 tree Stephen Rothwell
2009-05-27 9:58 ` Steven Whitehouse
2009-06-12 1:12 ` Stephen Rothwell
2009-06-12 1:19 ` Al Viro [this message]
-- strict thread matches above, loose matches on Subject: below --
2010-01-17 23:55 Stephen Rothwell
2010-01-18 10:56 ` Steven Whitehouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090612011948.GZ8633@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=swhiteho@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.