From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Neil Brown <neilb@suse•de>, Jens Axboe <axboe@kernel•dk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Kent Overstreet <kent.overstreet@gmail•com>
Subject: linux-next: manual merge of the md tree with the block tree
Date: Mon, 17 Aug 2015 14:44:12 +1000 [thread overview]
Message-ID: <20150817144412.3a586c5e@canb.auug.org.au> (raw)
Hi Neil,
Today's linux-next merge of the md tree got a conflict in:
drivers/md/raid0.c
between commit:
8ae126660fdd ("block: kill merge_bvec_fn() completely")
from the block tree and commit:
927d881980b7 ("md/raid0: update queue parameter in a safer location.")
from the md tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/md/raid0.c
index 59cda501a224,4a13c3cb940b..000000000000
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@@ -188,10 -203,9 +203,6 @@@ static int create_strip_zones(struct md
}
dev[j] = rdev1;
- if (mddev->queue)
- disk_stack_limits(mddev->gendisk, rdev1->bdev,
- rdev1->data_offset << 9);
- if (rdev1->bdev->bd_disk->queue->merge_bvec_fn)
- conf->has_merge_bvec = 1;
--
if (!smallest || (rdev1->sectors < smallest->sectors))
smallest = rdev1;
cnt++;
next reply other threads:[~2015-08-17 4:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-17 4:44 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-31 4:34 linux-next: manual merge of the md tree with the block tree 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
2014-01-15 4:07 Stephen Rothwell
2014-01-15 5:30 ` NeilBrown
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=20150817144412.3a586c5e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=kent.overstreet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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