From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Thu, 14 Jan 2016 00:29:30 +0000 (-0800)
Subject: Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc
X-Git-Tag: v4.5-rc1~17^2
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=60539fa3a1e3caf458a943b1a14154e3fa44d0d1;hp=-c;p=cascardo%2Flinux.git

Merge remote-tracking branch 'mkp-scsi/4.5/scsi-queue' into misc
---

60539fa3a1e3caf458a943b1a14154e3fa44d0d1
diff --combined drivers/scsi/Kconfig
index c1fe0d2f90ca,abdd4360e219..23d862dfdde3
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -194,7 -194,6 +194,7 @@@ config CHR_DEV_SC
  config SCSI_ENCLOSURE
  	tristate "SCSI Enclosure Support"
  	depends on SCSI && ENCLOSURE_SERVICES
 +	depends on m || SCSI_SAS_ATTRS != m
  	help
  	  Enclosures are devices sitting on or in SCSI backplanes that
  	  manage devices.  If you have a disk cage, the chances are that
@@@ -365,7 -364,6 +365,7 @@@ config SCSI_HPS
  	tristate "HP Smart Array SCSI driver"
  	depends on PCI && SCSI
  	select CHECK_SIGNATURE
 +	select SCSI_SAS_ATTRS
  	help
  	  This driver supports HP Smart Array Controllers (circa 2009).
  	  It is a SCSI alternative to the cciss driver, which is a block
@@@ -502,7 -500,6 +502,7 @@@ config SCSI_ADVANSY
  	tristate "AdvanSys SCSI support"
  	depends on SCSI
  	depends on ISA || EISA || PCI
 +	depends on ISA_DMA_API || !ISA
  	help
  	  This is a driver for all SCSI host adapters manufactured by
  	  AdvanSys. It is documented in the kernel source in
@@@ -1620,23 -1617,6 +1620,6 @@@ config ATARI_SCS
  	  ST-DMA, replacing ACSI).  It does NOT support other schemes, like
  	  in the Hades (without DMA).
  
- config ATARI_SCSI_TOSHIBA_DELAY
- 	bool "Long delays for Toshiba CD-ROMs"
- 	depends on ATARI_SCSI
- 	help
- 	  This option increases the delay after a SCSI arbitration to
- 	  accommodate some flaky Toshiba CD-ROM drives. Say Y if you intend to
- 	  use a Toshiba CD-ROM drive; otherwise, the option is not needed and
- 	  would impact performance a bit, so say N.
- 
- config ATARI_SCSI_RESET_BOOT
- 	bool "Reset SCSI-devices at boottime"
- 	depends on ATARI_SCSI
- 	help
- 	  Reset the devices on your Atari whenever it boots.  This makes the
- 	  boot process fractionally longer but may assist recovery from errors
- 	  that leave the devices with SCSI operations partway completed.
- 
  config MAC_SCSI
  	tristate "Macintosh NCR5380 SCSI"
  	depends on MAC && SCSI=y