linux-next: manual merge of the scsi tree with the scsi-fixes tree

[Stephen Rothwell]

Hi all,

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

  drivers/target/iscsi/iscsi_target.c

between commit:

  0352c3d3959a ("scsi: target: iscsi: Fix zero tag inside a trace event")

from the scsi-fixes tree and commit:

  08694199477d ("scsi: target: core: Add gfp_t arg to target_cmd_init_cdb()")

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/target/iscsi/iscsi_target.c
index e5c443bfbdf9,cf7f0465dd63..000000000000
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -1166,8 -1166,8 +1166,9 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
  
  	target_get_sess_cmd(&cmd->se_cmd, true);
  
 +	cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
- 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb);
+ 	cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
+ 						GFP_KERNEL);
  	if (cmd->sense_reason) {
  		if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
  			return iscsit_add_reject_cmd(cmd,

Attachment: pgp_JrU8rJBJv.pgp
Description: OpenPGP digital signature