From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 01:29:18 +0000 (-0400)
Subject: Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb... 
X-Git-Tag: fixes-for-v3.18-merge-window~25
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a50aaefc1b896e734bf7faf3d085f71a360ce97;p=pandora-kernel.git

Merge tag 'scsi-for-linus' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This patch set consists of the usual driver updates (megaraid_sas,
  arcmsr, be2iscsi, lpfc, mpt2sas, mpt3sas, qla2xxx, ufs) plus several
  assorted fixes and miscellaneous updates (including the
  pci_msix_enable_range() changes that have been pending for a while)"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (202 commits)
  scsi: add a CONFIG_SCSI_MQ_DEFAULT option
  ufs: definitions for phy interface
  ufs: tune bkops while power managment events
  ufs: Add support for clock scaling using devfreq framework
  ufs: Add freq-table-hz property for UFS device
  ufs: Add support for clock gating
  ufs: refactor configuring power mode
  ufs: add UFS power management support
  ufs: introduce well known logical unit in ufs
  ufs: manually add well known logical units
  ufs: Active Power Mode - configuring bActiveICCLevel
  ufs: improve init sequence
  ufs: refactor query descriptor API support
  ufs: add voting support for host controller power
  ufs: Add clock initialization support
  ufs: Add regulator enable support
  ufs: Allow vendor specific initialization
  scsi: don't add scsi_device if its already visible
  scsi: fix the type for well known LUs
  scsi: fix comment in struct Scsi_Host definition
  ...
---

9a50aaefc1b896e734bf7faf3d085f71a360ce97
diff --cc drivers/scsi/Kconfig
index bd85fb4978e0,71b0877245cb..e85e64a07d02
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -43,8 -43,19 +43,19 @@@ config SCSI_DM
  config SCSI_NETLINK
  	bool
  	default	n
 -	select NET
 +	depends on NET
  
+ config SCSI_MQ_DEFAULT
+ 	bool "SCSI: use blk-mq I/O path by default"
+ 	depends on SCSI
+ 	---help---
+ 	  This option enables the new blk-mq based I/O path for SCSI
+ 	  devices by default.  With the option the scsi_mod.use_blk_mq
+ 	  module/boot option defaults to Y, without it to N, but it can
+ 	  still be overriden either way.
+ 
+ 	  If unsure say N.
+ 
  config SCSI_PROC_FS
  	bool "legacy /proc/scsi/ support"
  	depends on SCSI && PROC_FS