Subject: linux-next: manual merge of the scsi tree with the usb tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 14 Nov 2014 18:00:54 +1100

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/usb/storage/uas.c between commit e28e2f2f7c42 ("uas: Make uas
work with blk-mq") from the usb tree and commits 125c99bc8b6b ("scsi:
add new scsi-command flag for tagged commands"), abd0c533e377
("scsi: remove ordered_tag host template field") and 2ecb204d07ac
("scsi: always assign block layer tags if enabled") from the scsi tree.

I fixed it up (maybe, please check - see below) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/usb/storage/uas.c
index 004ebc12bc21,33f211b56a42..000000000000
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@@ -806,7 -816,14 +805,7 @@@ static struct scsi_host_template uas_ho
  	.sg_tablesize = SG_NONE,
  	.cmd_per_lun = 1,	/* until we override it */
  	.skip_settle_delay = 1,
- 	.ordered_tag = 1,
 -
 -	/*
 -	 * The uas drivers expects tags not to be bigger than the maximum
 -	 * per-device queue depth, which is not true with the blk-mq tag
 -	 * allocator.
 -	 */
 -	.disable_blk_mq = true,
+ 	.use_blk_tags = 1,
  };
  
  #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \