From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: linux-next: manual merge of the bkl-trivial tree with the mmc tree Date: Mon, 20 Sep 2010 11:15:25 +0200 Message-ID: <201009201115.25673.arnd@arndb.de> References: <20100920145817.71fa0c35.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de ([212.227.126.171]:49292 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756057Ab0ITJP3 (ORCPT ); Mon, 20 Sep 2010 05:15:29 -0400 In-Reply-To: <20100920145817.71fa0c35.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Olof Johansson , Chris Ball On Monday 20 September 2010, Stephen Rothwell wrote: > Today's linux-next merge of the bkl-trivial tree got a conflict in > drivers/mmc/card/block.c between commit > 28280d210bacf6788a5e4b12c5a9430bd50860b4 ("mmc: make number of mmcblk > minors configurable") from the mmc tree and commit > 5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL > users to private mutex") from the bkl-trivial tree. > > I fixed it up (see below) and can carry the fix as necessary. Looks good, thanks! Chris, do you want to take my patch into your tree instead? Or even better you could figure out if the BKL is actually needed there and remove it otherwise so we don't need to introduce the mutex here. Arnd