From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Neil Brown <neilb@suse•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andre Noll <maan@systemlinux•org>
Subject: linux-next: manual merge of the md tree with the tree
Date: Wed, 10 Jun 2009 14:38:01 +1000 [thread overview]
Message-ID: <20090610143801.cce5f7cf.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
Hi Neil,
Today's linux-next merge of the md tree got a conflict in
drivers/md/raid5.c between commit
0e6e0271a210817e202c8a4bfffbde3e3c0616d1 ("md/raid5: fix bug in reshape
code when chunk_size decreases") from the md-current tree and commit
dbf4da18b39fd412a76c3e1b9d7b29c8cc0197fb ("md: convert conf->chunk_size
and conf->prev_chunk to sectors") from the md tree.
Overlapping changes. I used the version from the md-current tree
(stripe_addr+reshape_sectors) as it appears to be newer.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2009-06-10 4:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-10 4:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-01-15 4:02 linux-next: manual merge of the md tree with the tree Stephen Rothwell
2012-09-21 2:49 Stephen Rothwell
2009-03-10 5:33 Stephen Rothwell
2009-03-10 6:40 ` NeilBrown
2009-03-10 6:49 ` 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=20090610143801.cce5f7cf.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maan@systemlinux$(echo .)org \
--cc=neilb@suse$(echo .)de \
/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