From: Jens Axboe <jens.axboe@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Ben Hutchings" <bhutchings@solarflare.com>,
"Artem Bityutskiy" <Artem.Bityutskiy@nokia.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"\"Jörn Engel\"" <joern@logfs.org>
Subject: Re: linux-next: manual merge of the block tree with the mtd tree
Date: Wed, 28 Apr 2010 09:22:22 +0200 [thread overview]
Message-ID: <20100428072222.GP27497@kernel.dk> (raw)
In-Reply-To: <20100428132423.0cb8bd44.sfr@canb.auug.org.au>
On Wed, Apr 28 2010, Stephen Rothwell wrote:
> Hi Jens,
>
> Today's linux-next merge of the block tree got a conflict in
> drivers/mtd/mtdcore.c between commit
> b520e412faaaad35641aeedd6059179f9f1b393c ("mtd: Replace static array of
> devices with an idr structure") from the mtd tree and commit
> a33eb6b91034c95b9b08576f68be170f995b2c7d ("Move mtd_bdi_*mappable to
> mtdcore.c") from the block tree.
>
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks, looks good. It should go away soon, as the below bits are for
2.6.34.
--
Jens Axboe
prev parent reply other threads:[~2010-04-28 7:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 3:24 linux-next: manual merge of the block tree with the mtd tree Stephen Rothwell
2010-04-28 7:22 ` Jens Axboe [this message]
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=20100428072222.GP27497@kernel.dk \
--to=jens.axboe@oracle.com \
--cc=Artem.Bityutskiy@nokia.com \
--cc=bhutchings@solarflare.com \
--cc=dwmw2@infradead.org \
--cc=joern@logfs.org \
--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).