Skip to content

Commit dd9e11d

Browse files
committed
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley: "Six late arriving patches for the merge window. Five are minor assorted fixes and updates. The IPR driver change removes SATA support, which will now allow a major cleanup in the ATA subsystem because it was the only driver still using the old attachment mechanism. The driver is only used on power systems and SATA was used to support a DVD device, which has long been moved to a different hba. IBM chose this route instead of porting ipr to the newer SATA interfaces" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: qedi: Fix use after free bug in qedi_remove() scsi: ufs: core: mcq: Fix &hwq->cq_lock deadlock issue scsi: ipr: Remove several unused variables scsi: pm80xx: Log device registration scsi: ipr: Remove SATA support scsi: scsi_debug: Abort commands from scsi_debug_device_reset()
2 parents a3b111b + c574963 commit dd9e11d

File tree

7 files changed

+43
-850
lines changed

7 files changed

+43
-850
lines changed

drivers/scsi/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,8 +971,7 @@ config SCSI_SYM53C8XX_MMIO
971971

972972
config SCSI_IPR
973973
tristate "IBM Power Linux RAID adapter support"
974-
depends on PCI && SCSI && ATA
975-
select SATA_HOST
974+
depends on PCI && SCSI
976975
select FW_LOADER
977976
select IRQ_POLL
978977
select SGL_ALLOC

0 commit comments

Comments
 (0)