From: NeilBrown <neilb@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Kent Overstreet <kmo@daterainc.com>
Subject: Re: linux-next: manual merge of the md tree with the block tree
Date: Wed, 15 Jan 2014 16:30:55 +1100 [thread overview]
Message-ID: <20140115163055.24e2bae2@notabene.brown> (raw)
In-Reply-To: <20140115150743.ff3de076048b32e82fa5ba27@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
On Wed, 15 Jan 2014 15:07:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
wrote:
> Hi Neil,
>
> Today's linux-next merge of the md tree got a conflict in
> drivers/md/raid10.c between commit 4f024f3797c4 ("block: Abstract out
> bvec iterator") from the block tree and commit b50c259e25d9 ("md/raid10:
> fix two bugs in handling of known-bad-blocks") from the md tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
Thanks Stephen.
Those md fixes are now on their way to Linus (I'm hoping for 3.13 inclusion,
I might be lucky). Good they they are easy to resolve!
Thanks,
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2014-01-15 5:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 4:07 linux-next: manual merge of the md tree with the block tree Stephen Rothwell
2014-01-15 5:30 ` NeilBrown [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-31 4:34 Stephen Rothwell
2017-08-29 4:13 Stephen Rothwell
2017-06-13 4:33 Stephen Rothwell
2017-04-12 2:31 Stephen Rothwell
2017-04-10 2:08 Stephen Rothwell
2017-04-10 2:03 Stephen Rothwell
2016-11-23 2:17 Stephen Rothwell
2016-11-22 4:50 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2016-06-14 3:52 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2015-08-17 4:44 Stephen Rothwell
2012-09-21 2:49 Stephen Rothwell
2011-10-07 3:06 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=20140115163055.24e2bae2@notabene.brown \
--to=neilb@suse.de \
--cc=axboe@kernel.dk \
--cc=kmo@daterainc.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).