Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This patch set consists of the usual driver updates (ufs, storvsc,
  pm8001 hpsa).  It also has removal of the user space target driver
  code (everyone is using LIO now), a partial PCI MSI-X update, more
  multi-queue updates, conversion to 64 bit LUNs (so we could
  theoretically cope with any LUN returned by a device) and placeholder
  support for the ZBC device type (Shingle drives), plus an assortment
  of minor updates and bug fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (143 commits)
  scsi: do not issue SCSI RSOC command to Promise Vtrak E610f
  vmw_pvscsi: Use pci_enable_msix_exact() instead of pci_enable_msix()
  pm8001: Fix invalid return when request_irq() failed
  lpfc: Remove superfluous call to pci_disable_msix()
  isci: Use pci_enable_msix_exact() instead of pci_enable_msix()
  bfa: Use pci_enable_msix_exact() instead of pci_enable_msix()
  bfa: Cleanup bfad_setup_intr() function
  bfa: Do not call pci_enable_msix() after it failed once
  fnic: Use pci_enable_msix_exact() instead of pci_enable_msix()
  scsi: use short driver name for per-driver cmd slab caches
  scsi_debug: support scsi-mq, queues and locks
  Drivers: add blist flags
  scsi: ufs: fix endianness sparse warnings
  scsi: ufs: make undeclared functions static
  bnx2i: Update driver version to 2.7.10.1
  pm8001: fix a memory leak in nvmd_resp
  pm8001: fix update_flash
  pm8001: fix a memory leak in flash_update
  pm8001: Cleaning up uninitialized variables
  pm8001: Fix to remove null pointer checks that could never happen
  ...

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 8c64b8776a96..340de9d92b15 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -252,7 +252,7 @@ static int tcm_loop_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *sc)
 {
         struct tcm_loop_cmd *tl_cmd;
 
-        pr_debug("tcm_loop_queuecommand() %d:%d:%d:%d got CDB: 0x%02x"
+        pr_debug("tcm_loop_queuecommand() %d:%d:%d:%llu got CDB: 0x%02x"
                 " scsi_buf_len: %u\n", sc->device->host->host_no,
                 sc->device->id, sc->device->channel, sc->device->lun,
                 sc->cmnd[0], scsi_bufflen(sc));
diff --git a/drivers/target/target_core_pscsi.c b/drivers/target/target_core_pscsi.c
index 94d00df28f39..943b1dbe859a 100644
--- a/drivers/target/target_core_pscsi.c
+++ b/drivers/target/target_core_pscsi.c
@@ -312,7 +312,7 @@ static int pscsi_add_device_to_list(struct se_device *dev,
         if (!sd->queue_depth) {
                 sd->queue_depth = PSCSI_DEFAULT_QUEUEDEPTH;
 
-                pr_err("Set broken SCSI Device %d:%d:%d"
+                pr_err("Set broken SCSI Device %d:%d:%llu"
                         " queue_depth to %d\n", sd->channel, sd->id,
                                 sd->lun, sd->queue_depth);
         }
@@ -375,7 +375,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)
         int ret;
 
         if (scsi_device_get(sd)) {
-                pr_err("scsi_device_get() failed for %d:%d:%d:%d\n",
+                pr_err("scsi_device_get() failed for %d:%d:%d:%llu\n",
                         sh->host_no, sd->channel, sd->id, sd->lun);
                 spin_unlock_irq(sh->host_lock);
                 return -EIO;
@@ -401,7 +401,7 @@ static int pscsi_create_type_disk(struct se_device *dev, struct scsi_device *sd)
                 return ret;
         }
 
-        pr_debug("CORE_PSCSI[%d] - Added TYPE_DISK for %d:%d:%d:%d\n",
+        pr_debug("CORE_PSCSI[%d] - Added TYPE_DISK for %d:%d:%d:%llu\n",
                 phv->phv_host_id, sh->host_no, sd->channel, sd->id, sd->lun);
         return 0;
 }
@@ -417,7 +417,7 @@ static int pscsi_create_type_rom(struct se_device *dev, struct scsi_device *sd)
         int ret;
 
         if (scsi_device_get(sd)) {
-                pr_err("scsi_device_get() failed for %d:%d:%d:%d\n",
+                pr_err("scsi_device_get() failed for %d:%d:%d:%llu\n",
                         sh->host_no, sd->channel, sd->id, sd->lun);
                 spin_unlock_irq(sh->host_lock);
                 return -EIO;
@@ -429,7 +429,7 @@ static int pscsi_create_type_rom(struct se_device *dev, struct scsi_device *sd)
                 scsi_device_put(sd);
                 return ret;
         }
-        pr_debug("CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%d\n",
+        pr_debug("CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%llu\n",
                 phv->phv_host_id, scsi_device_type(sd->type), sh->host_no,
                 sd->channel, sd->id, sd->lun);
 
@@ -452,7 +452,7 @@ static int pscsi_create_type_other(struct se_device *dev,
         if (ret)
                 return ret;
 
-        pr_debug("CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%d\n",
+        pr_debug("CORE_PSCSI[%d] - Added Type: %s for %d:%d:%d:%llu\n",
                 phv->phv_host_id, scsi_device_type(sd->type), sh->host_no,
                 sd->channel, sd->id, sd->lun);
         return 0;