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

diff --combined drivers/scsi/Kconfig
index c1fe0d2,abdd436..23d862d
--- 1/drivers/scsi/Kconfig
--- 2/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