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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 8 Nov 2016 16:48:04 +1100

Hi James,

Today's linux-next merge of the scsi tree got a conflict in:

  drivers/scsi/ufs/ufshcd.c

between commit:

  e806402130c9 ("block: split out request-only flags into a new namespace")

from the block tree and commit:

  2266d5678ad1 ("scsi: ufs: fix sense buffer size to 18 bytes")

from the scsi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/ufs/ufshcd.c
index cf549871c1ee,304adce3bdbe..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -5589,8 -5642,8 +5642,8 @@@ ufshcd_send_request_sense(struct ufs_hb
  	}
  
  	ret = scsi_execute_req_flags(sdp, cmd, DMA_FROM_DEVICE, buffer,
- 				SCSI_SENSE_BUFFERSIZE, NULL,
+ 				UFSHCD_REQ_SENSE_SIZE, NULL,
 -				msecs_to_jiffies(1000), 3, NULL, REQ_PM);
 +				msecs_to_jiffies(1000), 3, NULL, 0, RQF_PM);
  	if (ret)
  		pr_err("%s: failed with err %d\n", __func__, ret);