From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbbHQEoa (ORCPT ); Mon, 17 Aug 2015 00:44:30 -0400 Received: from ozlabs.org ([103.22.144.67]:59150 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbbHQEoO (ORCPT ); Mon, 17 Aug 2015 00:44:14 -0400 Date: Mon, 17 Aug 2015 14:44:12 +1000 From: Stephen Rothwell To: Neil Brown , Jens Axboe Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kent Overstreet Subject: linux-next: manual merge of the md tree with the block tree Message-ID: <20150817144412.3a586c5e@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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++;