diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 23:10:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 23:10:32 -0400 |
commit | 6b22df74f7af62137772c280791c932855f7635b (patch) | |
tree | 1ae52bc548b48eb9d243c41363b5c39fb93a5ca6 /arch/m68k | |
parent | 930e0312bcdc96d15f02ed6812d4a6c947855a2d (diff) | |
parent | a93cb871cdeace7de7d865555ed492e8bc8075b5 (diff) |
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
...
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/configs/amiga_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/apollo_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/atari_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/bvme6000_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/hp300_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/mvme16x_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/q40_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/sun3_defconfig | 1 | ||||
-rw-r--r-- | arch/m68k/configs/sun3x_defconfig | 1 |
12 files changed, 0 insertions, 12 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index d7eac833a94f..399df883c8bb 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig | |||
@@ -257,7 +257,6 @@ CONFIG_BLK_DEV_GAYLE=y | |||
257 | CONFIG_BLK_DEV_BUDDHA=y | 257 | CONFIG_BLK_DEV_BUDDHA=y |
258 | CONFIG_RAID_ATTRS=m | 258 | CONFIG_RAID_ATTRS=m |
259 | CONFIG_SCSI=y | 259 | CONFIG_SCSI=y |
260 | CONFIG_SCSI_TGT=m | ||
261 | CONFIG_BLK_DEV_SD=y | 260 | CONFIG_BLK_DEV_SD=y |
262 | CONFIG_CHR_DEV_ST=m | 261 | CONFIG_CHR_DEV_ST=m |
263 | CONFIG_CHR_DEV_OSST=m | 262 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 650ee75de6cd..be16740c0749 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig | |||
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m | |||
244 | CONFIG_DUMMY_IRQ=m | 244 | CONFIG_DUMMY_IRQ=m |
245 | CONFIG_RAID_ATTRS=m | 245 | CONFIG_RAID_ATTRS=m |
246 | CONFIG_SCSI=y | 246 | CONFIG_SCSI=y |
247 | CONFIG_SCSI_TGT=m | ||
248 | CONFIG_BLK_DEV_SD=y | 247 | CONFIG_BLK_DEV_SD=y |
249 | CONFIG_CHR_DEV_ST=m | 248 | CONFIG_CHR_DEV_ST=m |
250 | CONFIG_CHR_DEV_OSST=m | 249 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 3142e69342fa..391e185d73be 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig | |||
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y | |||
251 | CONFIG_BLK_DEV_FALCON_IDE=y | 251 | CONFIG_BLK_DEV_FALCON_IDE=y |
252 | CONFIG_RAID_ATTRS=m | 252 | CONFIG_RAID_ATTRS=m |
253 | CONFIG_SCSI=y | 253 | CONFIG_SCSI=y |
254 | CONFIG_SCSI_TGT=m | ||
255 | CONFIG_BLK_DEV_SD=y | 254 | CONFIG_BLK_DEV_SD=y |
256 | CONFIG_CHR_DEV_ST=m | 255 | CONFIG_CHR_DEV_ST=m |
257 | CONFIG_CHR_DEV_OSST=m | 256 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig index 0daa8a172f30..d0e705d1a063 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig | |||
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m | |||
242 | CONFIG_DUMMY_IRQ=m | 242 | CONFIG_DUMMY_IRQ=m |
243 | CONFIG_RAID_ATTRS=m | 243 | CONFIG_RAID_ATTRS=m |
244 | CONFIG_SCSI=y | 244 | CONFIG_SCSI=y |
245 | CONFIG_SCSI_TGT=m | ||
246 | CONFIG_BLK_DEV_SD=y | 245 | CONFIG_BLK_DEV_SD=y |
247 | CONFIG_CHR_DEV_ST=m | 246 | CONFIG_CHR_DEV_ST=m |
248 | CONFIG_CHR_DEV_OSST=m | 247 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 88af78f7bad9..fdc7e9672249 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig | |||
@@ -244,7 +244,6 @@ CONFIG_ATA_OVER_ETH=m | |||
244 | CONFIG_DUMMY_IRQ=m | 244 | CONFIG_DUMMY_IRQ=m |
245 | CONFIG_RAID_ATTRS=m | 245 | CONFIG_RAID_ATTRS=m |
246 | CONFIG_SCSI=y | 246 | CONFIG_SCSI=y |
247 | CONFIG_SCSI_TGT=m | ||
248 | CONFIG_BLK_DEV_SD=y | 247 | CONFIG_BLK_DEV_SD=y |
249 | CONFIG_CHR_DEV_ST=m | 248 | CONFIG_CHR_DEV_ST=m |
250 | CONFIG_CHR_DEV_OSST=m | 249 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 66f915574a85..3d345641d5a0 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -251,7 +251,6 @@ CONFIG_BLK_DEV_IDECD=y | |||
251 | CONFIG_BLK_DEV_MAC_IDE=y | 251 | CONFIG_BLK_DEV_MAC_IDE=y |
252 | CONFIG_RAID_ATTRS=m | 252 | CONFIG_RAID_ATTRS=m |
253 | CONFIG_SCSI=y | 253 | CONFIG_SCSI=y |
254 | CONFIG_SCSI_TGT=m | ||
255 | CONFIG_BLK_DEV_SD=y | 254 | CONFIG_BLK_DEV_SD=y |
256 | CONFIG_CHR_DEV_ST=m | 255 | CONFIG_CHR_DEV_ST=m |
257 | CONFIG_CHR_DEV_OSST=m | 256 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 5eaa49924fa6..59aa42096000 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -273,7 +273,6 @@ CONFIG_BLK_DEV_MAC_IDE=y | |||
273 | CONFIG_BLK_DEV_Q40IDE=y | 273 | CONFIG_BLK_DEV_Q40IDE=y |
274 | CONFIG_RAID_ATTRS=m | 274 | CONFIG_RAID_ATTRS=m |
275 | CONFIG_SCSI=y | 275 | CONFIG_SCSI=y |
276 | CONFIG_SCSI_TGT=m | ||
277 | CONFIG_BLK_DEV_SD=y | 276 | CONFIG_BLK_DEV_SD=y |
278 | CONFIG_CHR_DEV_ST=m | 277 | CONFIG_CHR_DEV_ST=m |
279 | CONFIG_CHR_DEV_OSST=m | 278 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 324d0b4d8351..066b24af095e 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig | |||
@@ -241,7 +241,6 @@ CONFIG_ATA_OVER_ETH=m | |||
241 | CONFIG_DUMMY_IRQ=m | 241 | CONFIG_DUMMY_IRQ=m |
242 | CONFIG_RAID_ATTRS=m | 242 | CONFIG_RAID_ATTRS=m |
243 | CONFIG_SCSI=y | 243 | CONFIG_SCSI=y |
244 | CONFIG_SCSI_TGT=m | ||
245 | CONFIG_BLK_DEV_SD=y | 244 | CONFIG_BLK_DEV_SD=y |
246 | CONFIG_CHR_DEV_ST=m | 245 | CONFIG_CHR_DEV_ST=m |
247 | CONFIG_CHR_DEV_OSST=m | 246 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig index f0cb4338952e..9326ea664a5b 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig | |||
@@ -242,7 +242,6 @@ CONFIG_ATA_OVER_ETH=m | |||
242 | CONFIG_DUMMY_IRQ=m | 242 | CONFIG_DUMMY_IRQ=m |
243 | CONFIG_RAID_ATTRS=m | 243 | CONFIG_RAID_ATTRS=m |
244 | CONFIG_SCSI=y | 244 | CONFIG_SCSI=y |
245 | CONFIG_SCSI_TGT=m | ||
246 | CONFIG_BLK_DEV_SD=y | 245 | CONFIG_BLK_DEV_SD=y |
247 | CONFIG_CHR_DEV_ST=m | 246 | CONFIG_CHR_DEV_ST=m |
248 | CONFIG_CHR_DEV_OSST=m | 247 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index d6cf0880c463..d7d1101e31b5 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig | |||
@@ -249,7 +249,6 @@ CONFIG_BLK_DEV_IDECD=y | |||
249 | CONFIG_BLK_DEV_Q40IDE=y | 249 | CONFIG_BLK_DEV_Q40IDE=y |
250 | CONFIG_RAID_ATTRS=m | 250 | CONFIG_RAID_ATTRS=m |
251 | CONFIG_SCSI=y | 251 | CONFIG_SCSI=y |
252 | CONFIG_SCSI_TGT=m | ||
253 | CONFIG_BLK_DEV_SD=y | 252 | CONFIG_BLK_DEV_SD=y |
254 | CONFIG_CHR_DEV_ST=m | 253 | CONFIG_CHR_DEV_ST=m |
255 | CONFIG_CHR_DEV_OSST=m | 254 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig index f4e88d1c7472..98522e8fb852 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig | |||
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m | |||
239 | CONFIG_DUMMY_IRQ=m | 239 | CONFIG_DUMMY_IRQ=m |
240 | CONFIG_RAID_ATTRS=m | 240 | CONFIG_RAID_ATTRS=m |
241 | CONFIG_SCSI=y | 241 | CONFIG_SCSI=y |
242 | CONFIG_SCSI_TGT=m | ||
243 | CONFIG_BLK_DEV_SD=y | 242 | CONFIG_BLK_DEV_SD=y |
244 | CONFIG_CHR_DEV_ST=m | 243 | CONFIG_CHR_DEV_ST=m |
245 | CONFIG_CHR_DEV_OSST=m | 244 | CONFIG_CHR_DEV_OSST=m |
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig index 49f4032c1ad6..5128a8c3f4e3 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig | |||
@@ -239,7 +239,6 @@ CONFIG_ATA_OVER_ETH=m | |||
239 | CONFIG_DUMMY_IRQ=m | 239 | CONFIG_DUMMY_IRQ=m |
240 | CONFIG_RAID_ATTRS=m | 240 | CONFIG_RAID_ATTRS=m |
241 | CONFIG_SCSI=y | 241 | CONFIG_SCSI=y |
242 | CONFIG_SCSI_TGT=m | ||
243 | CONFIG_BLK_DEV_SD=y | 242 | CONFIG_BLK_DEV_SD=y |
244 | CONFIG_CHR_DEV_ST=m | 243 | CONFIG_CHR_DEV_ST=m |
245 | CONFIG_CHR_DEV_OSST=m | 244 | CONFIG_CHR_DEV_OSST=m |