From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959Ab0I0Ep0 (ORCPT ); Mon, 27 Sep 2010 00:45:26 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:59360 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038Ab0I0EpZ (ORCPT ); Mon, 27 Sep 2010 00:45:25 -0400 Date: Mon, 27 Sep 2010 14:45:19 +1000 From: Stephen Rothwell To: Arnd Bergmann Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Vivek Goyal , Jens Axboe Subject: linux-next: manual merge of the bkl-trivial tree with the block tree Message-Id: <20100927144519.25cd3afa.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-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 Arnd, Today's linux-next merge of the bkl-trivial tree got a conflict in drivers/block/ataflop.c between commit 639e2f2aa76eefaf22078dccbbf2f3483f587aa7 ("atari floppy: Stop sharing request queue across multiple gendisks") from the block tree and commit 5778067afcfd8b718ffc3744c25fdd194fc886a1 ("block: autoconvert trivial BKL users to private mutex") from the bkl-trivial tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/block/ataflop.c index 0f4eec4,8c021bb..0000000 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@@ -79,8 -79,9 +79,9 @@@ #undef DEBUG + static DEFINE_MUTEX(ataflop_mutex); -static struct request_queue *floppy_queue; static struct request *fd_request; +static int fdc_queue; /* Disk types: DD, HD, ED */ static struct atari_disk_type {