From: Steven Whitehouse <swhiteho@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jens Axboe <jaxboe@fusionio.com>
Subject: Re: linux-next: manual merge of the gfs2 tree with Linus' tree
Date: Wed, 13 Apr 2011 11:14:57 +0100 [thread overview]
Message-ID: <1302689697.2613.6.camel@dolmen> (raw)
In-Reply-To: <20110401105545.b2873be4.sfr@canb.auug.org.au>
Hi,
On Fri, 2011-04-01 at 10:55 +1100, Stephen Rothwell wrote:
> Hi Steven,
>
> Today's linux-next merge of the gfs2 tree got a conflict in fs/gfs2/log.c
> between commit 721a9602e660 ("block: kill off REQ_UNPLUG") from Linus'
> tree and commit 7ef2a4f51303 ("GFS2: Use filemap_fdatawrite() to write
> back the AIL") from the gfs2 tree.
>
> The former removed some of the code modified by the latter, so I did that.
Sorry for the delay as I was away last week. That was the correct fix
and I've updated the tree so that it shouldn't be an issue any more,
Steve.
next prev parent reply other threads:[~2011-04-13 10:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 23:55 linux-next: manual merge of the gfs2 tree with Linus' tree Stephen Rothwell
2011-04-13 10:14 ` Steven Whitehouse [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-14 21:36 Stephen Rothwell
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=1302689697.2613.6.camel@dolmen \
--to=swhiteho@redhat.com \
--cc=jaxboe@fusionio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).