Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is quite a bumper crop of fixes: three from Arnd correcting
  various build issues in some configurations, a lock recursion in
  qla2xxx.  Two potentially exploitable issues in hpsa and mvsas, a
  potential null deref in st, a revert of a bdi registration fix that
  turned out to cause even more problems, a set of fixes to allow people
  who only defined MPT2SAS to still work after the mpt2/mpt3sas merger
  and a couple of fixes for issues turned up by the hyper-v storvsc
  driver"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  mpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility
  Revert "scsi: Fix a bdi reregistration race"
  mpt3sas: Add dummy Kconfig option for backwards compatibility
  Fix a memory leak in scsi_host_dev_release()
  block/sd: Fix device-imposed transfer length limits
  scsi_debug: fix prevent_allow+verify regressions
  MAINTAINERS: Add myself as co-maintainer of the SCSI subsystem.
  sd: Make discard granularity match logical block size when LBPRZ=1
  scsi: hpsa: select CONFIG_SCSI_SAS_ATTR
  scsi: advansys needs ISA dma api for ISA support
  scsi_sysfs: protect against double execution of __scsi_remove_device()
  st: fix potential null pointer dereference.
  scsi: report 'INQUIRY result too short' once per host
  advansys: fix big-endian builds
  qla2xxx: Fix rwlock recursion
  hpsa: logical vs bitwise AND typo
  mvsas: don't allow negative timeouts
  mpt3sas: Fix use sas_is_tlr_enabled API before enabling MPI2_SCSIIO_CONTROL_TLR_ON flag

diff --combined MAINTAINERS
index f7dcb44,8174cc2..69c8a9c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -318,7 -318,7 +318,7 @@@ M: Zhang Rui <rui.zhang@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
  S:    Supported
 -F:    drivers/acpi/video.c
 +F:    drivers/acpi/acpi_video.c
  
  ACPI WMI DRIVER
  L:    platform-driver-x86@vger.kernel.org
@@@ -1847,7 -1847,7 +1847,7 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/ath6kl/
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
 +M:    Maya Erez <qca_merez@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  L:    wil6210@qca.qualcomm.com
  S:    Supported
@@@ -1931,7 -1931,7 +1931,7 @@@ S:      Supporte
  F:    drivers/i2c/busses/i2c-at91.c
  
  ATMEL ISI DRIVER
 -M:    Josh Wu <josh.wu@atmel.com>
 +M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/platform/soc_camera/atmel-isi.c
@@@ -1950,8 -1950,7 +1950,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/cadence/
  
  ATMEL NAND DRIVER
 -M:    Josh Wu <josh.wu@atmel.com>
 +M:    Wenyou Yang <wenyou.yang@atmel.com>
 +M:    Josh Wu <rainyfeeling@outlook.com>
  L:    linux-mtd@lists.infradead.org
  S:    Supported
  F:    drivers/mtd/nand/atmel_nand*
@@@ -2450,9 -2449,7 +2450,9 @@@ F:      drivers/firmware/broadcom/
  
  BROADCOM STB NAND FLASH DRIVER
  M:    Brian Norris <computersforpeace@gmail.com>
 +M:    Kamal Dasu <kdasu.kdev@gmail.com>
  L:    linux-mtd@lists.infradead.org
 +L:    bcm-kernel-feedback-list@broadcom.com
  S:    Maintained
  F:    drivers/mtd/nand/brcmnand/
  
@@@ -2549,7 -2546,7 +2549,7 @@@ F:      arch/c6x
  
  CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
  M:    David Howells <dhowells@redhat.com>
 -L:    linux-cachefs@redhat.com
 +L:    linux-cachefs@redhat.com (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/filesystems/caching/cachefiles.txt
  F:    fs/cachefiles/
@@@ -2932,9 -2929,10 +2932,9 @@@ S:     Maintaine
  F:    drivers/platform/x86/compal-laptop.c
  
  CONEXANT ACCESSRUNNER USB DRIVER
 -M:    Simon Arlott <cxacru@fire.lp0.eu>
  L:    accessrunner-general@lists.sourceforge.net
  W:    http://accessrunner.sourceforge.net/
 -S:    Maintained
 +S:    Orphan
  F:    drivers/usb/atm/cxacru.c
  
  CONFIGFS
@@@ -4411,7 -4409,6 +4411,7 @@@ K:      fmc_d.*registe
  
  FPGA MANAGER FRAMEWORK
  M:    Alan Tull <atull@opensource.altera.com>
 +R:    Moritz Fischer <moritz.fischer@ettus.com>
  S:    Maintained
  F:    drivers/fpga/
  F:    include/linux/fpga/fpga-mgr.h
@@@ -4562,7 -4559,7 +4562,7 @@@ F:      include/linux/frontswap.
  
  FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
  M:    David Howells <dhowells@redhat.com>
 -L:    linux-cachefs@redhat.com
 +L:    linux-cachefs@redhat.com (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/filesystems/caching/
  F:    fs/fscache/
@@@ -5714,6 -5711,13 +5714,6 @@@ M:     Juanjo Ciarlante <jjciarla@raiz.uncu
  S:    Maintained
  F:    net/ipv4/netfilter/ipt_MASQUERADE.c
  
 -IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
 -M:    Francois Romieu <romieu@fr.zoreil.com>
 -M:    Sorbica Shieh <sorbica@icplus.com.tw>
 -L:    netdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/net/ethernet/icplus/ipg.*
 -
  IPATH DRIVER
  M:    Mike Marciniszyn <infinipath@intel.com>
  L:    linux-rdma@vger.kernel.org
@@@ -6367,7 -6371,6 +6367,7 @@@ F:      arch/*/include/asm/pmem.
  LIGHTNVM PLATFORM SUPPORT
  M:    Matias Bjorling <mb@lightnvm.io>
  W:    http://github/OpenChannelSSD
 +L:    linux-block@vger.kernel.org
  S:    Maintained
  F:    drivers/lightnvm/
  F:    include/linux/lightnvm.h
@@@ -6920,21 -6923,13 +6920,21 @@@ F:   drivers/scsi/megaraid.
  F:    drivers/scsi/megaraid/
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
 -M:    Amir Vadai <amirv@mellanox.com>
 +M:    Eugenia Emantayev <eugenia@mellanox.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  F:    drivers/net/ethernet/mellanox/mlx4/en_*
  
 +MELLANOX ETHERNET DRIVER (mlx5e)
 +M:    Saeed Mahameed <saeedm@mellanox.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +F:    drivers/net/ethernet/mellanox/mlx5/core/en_*
 +
  MELLANOX ETHERNET SWITCH DRIVERS
  M:    Jiri Pirko <jiri@mellanox.com>
  M:    Ido Schimmel <idosch@mellanox.com>
@@@ -7906,18 -7901,6 +7906,18 @@@ S:    Maintaine
  F:    net/openvswitch/
  F:    include/uapi/linux/openvswitch.h
  
 +OPERATING PERFORMANCE POINTS (OPP)
 +M:    Viresh Kumar <vireshk@kernel.org>
 +M:    Nishanth Menon <nm@ti.com>
 +M:    Stephen Boyd <sboyd@codeaurora.org>
 +L:    linux-pm@vger.kernel.org
 +S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git
 +F:    drivers/base/power/opp/
 +F:    include/linux/pm_opp.h
 +F:    Documentation/power/opp.txt
 +F:    Documentation/devicetree/bindings/opp/
 +
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -9331,6 -9314,7 +9331,6 @@@ F:      drivers/i2c/busses/i2c-designware-
  F:    include/linux/platform_data/i2c-designware.h
  
  SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
 -M:    Seungwon Jeon <tgih.jun@samsung.com>
  M:    Jaehoon Chung <jh80.chung@samsung.com>
  L:    linux-mmc@vger.kernel.org
  S:    Maintained
@@@ -9427,8 -9411,10 +9427,10 @@@ F:    include/scsi/sg.
  
  SCSI SUBSYSTEM
  M:    "James E.J. Bottomley" <JBottomley@odin.com>
- L:    linux-scsi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
+ M:    "Martin K. Petersen" <martin.petersen@oracle.com>
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
+ L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/
  F:    include/scsi/
@@@ -10903,9 -10889,9 +10905,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
 -M:    Grant Grundler <grundler@parisc-linux.org>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +L:    linux-parisc@vger.kernel.org
 +S:    Orphan
  F:    drivers/net/ethernet/dec/tulip/
  
  TUN/TAP driver

diff --combined include/linux/blkdev.h
index c06f8ea,a5f9643..0169ba2
--- 1/include/linux/blkdev.h
--- 2/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@@ -254,6 -254,7 +254,7 @@@ struct queue_limits 
        unsigned long           virt_boundary_mask;
  
        unsigned int            max_hw_sectors;
+       unsigned int            max_dev_sectors;
        unsigned int            chunk_sectors;
        unsigned int            max_sectors;
        unsigned int            max_segment_size;
@@@ -773,6 -774,7 +774,6 @@@ extern void blk_rq_set_block_pc(struct 
  extern void blk_requeue_request(struct request_queue *, struct request *);
  extern void blk_add_request_payload(struct request *rq, struct page *page,
                unsigned int len);
 -extern int blk_rq_check_limits(struct request_queue *q, struct request *rq);
  extern int blk_lld_busy(struct request_queue *q);
  extern int blk_rq_prep_clone(struct request *rq, struct request *rq_src,
                             struct bio_set *bs, gfp_t gfp_mask,
@@@ -793,8 -795,6 +794,8 @@@ extern int scsi_cmd_ioctl(struct reques
  extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
                         struct scsi_ioctl_command __user *);
  
 +extern int blk_queue_enter(struct request_queue *q, gfp_t gfp);
 +extern void blk_queue_exit(struct request_queue *q);
  extern void blk_start_queue(struct request_queue *q);
  extern void blk_stop_queue(struct request_queue *q);
  extern void blk_sync_queue(struct request_queue *q);
@@@ -959,7 -959,6 +960,6 @@@ extern struct request_queue *blk_init_a
  extern void blk_cleanup_queue(struct request_queue *);
  extern void blk_queue_make_request(struct request_queue *, make_request_fn *);
  extern void blk_queue_bounce_limit(struct request_queue *, u64);
- extern void blk_limits_max_hw_sectors(struct queue_limits *, unsigned int);
  extern void blk_queue_max_hw_sectors(struct request_queue *, unsigned int);
  extern void blk_queue_chunk_sectors(struct request_queue *, unsigned int);
  extern void blk_queue_max_segments(struct request_queue *, unsigned short);