Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (6b22df74) · Commits · 戴 / test

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 ...

Documentation/scsi/tmscsim.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -317,8 +317,6 @@ Each of the parameters is a number, containing the described information:
		4 0x10 16 Immediate return on BIOS seek command. (Not used)
		(*)5 0x20 32 Check for LUNs >= 1.

		The default for LUN Check depends on CONFIG_SCSI_MULTI_LUN.

		* TaggedCmnds is a number indicating the maximum number of Tagged Commands.
		It is the binary logarithm - 1 of the actual number. Max is 4 (32).
		Value Number of Tagged Commands

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -2022,13 +2022,13 @@ S: Supported
		F: drivers/net/wireless/brcm80211/

		BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
		M: Eddie Wai <eddie.wai@broadcom.com>
		M: QLogic-Storage-Upstream@qlogic.com
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bnx2fc/

		BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
		M: Eddie Wai <eddie.wai@broadcom.com>
		M: QLogic-Storage-Upstream@qlogic.com
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bnx2i/

arch/arm/configs/msm_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ CONFIG_RFKILL=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		CONFIG_SCSI=y
		CONFIG_SCSI_TGT=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_CHR_DEV_SG=y
		CONFIG_CHR_DEV_SCH=y

arch/arm/configs/s3c2410_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -225,7 +225,6 @@ CONFIG_BLK_DEV_IDECD=y
		CONFIG_BLK_DEV_IDETAPE=m
		CONFIG_BLK_DEV_PLATFORM=y
		CONFIG_SCSI=y
		CONFIG_SCSI_TGT=m
		CONFIG_BLK_DEV_SD=y
		CONFIG_CHR_DEV_ST=m
		CONFIG_BLK_DEV_SR=m

arch/m68k/configs/amiga_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,6 @@ CONFIG_BLK_DEV_GAYLE=y
		CONFIG_BLK_DEV_BUDDHA=y
		CONFIG_RAID_ATTRS=m
		CONFIG_SCSI=y
		CONFIG_SCSI_TGT=m
		CONFIG_BLK_DEV_SD=y
		CONFIG_CHR_DEV_ST=m
		CONFIG_CHR_DEV_OSST=m

Admin message