From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752329Ab1KAIJt (ORCPT ); Tue, 1 Nov 2011 04:09:49 -0400 Received: from brick.kernel.dk ([87.104.106.3]:60427 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120Ab1KAIJr (ORCPT ); Tue, 1 Nov 2011 04:09:47 -0400 Message-ID: <4EAFA949.5060200@kernel.dk> Date: Tue, 01 Nov 2011 09:09:45 +0100 From: Jens Axboe MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Hellwig , NeilBrown Subject: Re: linux-next: manual merge of the block tree with Linus' tree References: <20111101161500.79aebe8d8f30162ea542a818@canb.auug.org.au> In-Reply-To: <20111101161500.79aebe8d8f30162ea542a818@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2011-11-01 06:15, Stephen Rothwell wrote: > Hi Jens, > > Today's linux-next merge of the block tree got a conflict in > drivers/md/raid10.c between commit fd01b88c75a7 ("md: remove typedefs: > mddev_t -> struct mddev") from Linus' tree and commit 5a7bbad27a41 > ("block: remove support for bio remapping from ->make_request") from the > block tree. > > I fixed it up (see below) and can carry the fix as necessary. Fixup looks good, however don't you get the same conflict in basically all the raid personalities? Fixup is indeed just the simple int -> void transition, conflict is because of the mddev_t -> struct mddev change that is now in Linus' tree. I'll push my pending off to Linus today or tomorrow, so this will be resolved shortly. -- Jens Axboe