From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Whitehouse <swhiteho@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jens Axboe <jaxboe@fusionio•com>
Subject: linux-next: manual merge of the gfs2 tree with Linus' tree
Date: Fri, 1 Apr 2011 10:55:45 +1100 [thread overview]
Message-ID: <20110401105545.b2873be4.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 419 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2011-03-31 23:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-31 23:55 Stephen Rothwell [this message]
2011-04-13 10:14 ` linux-next: manual merge of the gfs2 tree with Linus' tree Steven Whitehouse
-- 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=20110401105545.b2873be4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=jaxboe@fusionio$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=swhiteho@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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