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,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Jens Axboe <axboe@kernel.dk>, Shaohua Li <shli@fusionio.com>
Subject: linux-next: manual merge of the md tree with the block tree
Date: Fri, 21 Sep 2012 12:49:27 +1000 [thread overview]
Message-ID: <20120921124927.2008f0556cf6c0069c1d94c8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 972 bytes --]
Hi Neil,
Today's linux-next merge of the md tree got a conflict in
drivers/md/raid0.c between commit 4363ac7c13a9 ("block: Implement support
for WRITE SAME") from the block tree and commit c9264cda8f11 ("md: raid 0
supports TRIM") 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 a9e4fa9,1a8e5e3..0000000
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@@ -422,7 -431,7 +431,8 @@@ static int raid0_run(struct mddev *mdde
if (md_check_no_bitmap(mddev))
return -EINVAL;
blk_queue_max_hw_sectors(mddev->queue, mddev->chunk_sectors);
+ blk_queue_max_write_same_sectors(mddev->queue, mddev->chunk_sectors);
+ blk_queue_max_discard_sectors(mddev->queue, mddev->chunk_sectors);
/* if private is not null, we are here after takeover */
if (mddev->private == NULL) {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-21 2:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 2:49 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
2015-08-17 4:44 Stephen Rothwell
2014-01-15 4:07 Stephen Rothwell
2014-01-15 5:30 ` NeilBrown
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=20120921124927.2008f0556cf6c0069c1d94c8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=neilb@suse.de \
--cc=shli@fusionio.com \
/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).