Subject: linux-next: manual merge of the bkl-trivial tree with the block tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 27 Sep 2010 14:45:19 +1000

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                    [email-masked]

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 {