diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:10:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 16:10:45 -0800 |
| commit | 3e66848a3249105fe4973b0550b5b6cd42240168 (patch) | |
| tree | 3ff7bbcf2a476291f5536ea09b256c541c4456f3 /drivers/nvme/host/Kconfig | |
| parent | 2cda64cf6998a1d10961f69e2ac79c69b6d37795 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| download | linux-rpi-3e66848a3249105fe4973b0550b5b6cd42240168.tar.gz linux-rpi-3e66848a3249105fe4973b0550b5b6cd42240168.tar.bz2 linux-rpi-3e66848a3249105fe4973b0550b5b6cd42240168.zip | |
Merge 4.5-rc6 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nvme/host/Kconfig')
| -rw-r--r-- | drivers/nvme/host/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig index 5d6237391dcd..b586d84f2518 100644 --- a/drivers/nvme/host/Kconfig +++ b/drivers/nvme/host/Kconfig @@ -17,5 +17,6 @@ config BLK_DEV_NVME_SCSI and block devices nodes, as well a a translation for a small number of selected SCSI commands to NVMe commands to the NVMe driver. If you don't know what this means you probably want - to say N here, and if you know what it means you probably - want to say N as well. + to say N here, unless you run a distro that abuses the SCSI + emulation to provide stable device names for mount by id, like + some OpenSuSE and SLES versions. |