Merge remote-tracking branch 'target-updates/for-next'

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/qla2xxx/tcm_qla2xxx.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_login.c
Simple merge

diff --cc drivers/target/target_core_spc.c
index 9fabbf7214cd70cc3d4ad3e1bfa74f7ac516cdd0,6144b69f7d6474800ec3fe0846d878410961b2b9..074539558a542d5a38dc4f911f0032dc4ed0c998
--- 1/drivers/target/target_core_spc.c
--- 2/drivers/target/target_core_spc.c
+++ b/drivers/target/target_core_spc.c
@@@ -95,14 -95,17 +95,20 @@@ spc_emulate_inquiry_std(struct se_cmd *
         */
        spc_fill_alua_data(lun->lun_sep, buf);
  
+       /*
+        * Set Third-Party Copy (3PC) bit to indicate support for EXTENDED_COPY
+        */
+       if (dev->dev_attrib.emulate_3pc)
+               buf[5] |= 0x8;
+ 
        buf[7] = 0x2; /* CmdQue=1 */
  
 -      snprintf(&buf[8], 8, "LIO-ORG");
 -      snprintf(&buf[16], 16, "%s", dev->t10_wwn.model);
 -      snprintf(&buf[32], 4, "%s", dev->t10_wwn.revision);
 +      memcpy(&buf[8], "LIO-ORG ", 8);
 +      memset(&buf[16], 0x20, 16);
 +      memcpy(&buf[16], dev->t10_wwn.model,
 +             min_t(size_t, strlen(dev->t10_wwn.model), 16));
 +      memcpy(&buf[32], dev->t10_wwn.revision,
 +             min_t(size_t, strlen(dev->t10_wwn.revision), 4));
        buf[4] = 31; /* Set additional length to 31 */
  
        return 0;

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc include/scsi/scsi.h
Simple merge

diff --cc lib/Makefile
Simple merge