From 503143acab311090d3c4b66869acfc13fa90be00 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Thu, 18 Jan 2018 19:02:09 +0100
Subject: [PATCH] Enable NVME_MULTIPATH, NVME_FC, NVME_TARGET_FC

This enables NVME support in various SCSI host adapters, so move the
nvme module into the scsi-modules installer udeb.
---
 debian/changelog                      | 2 ++
 debian/config/config                  | 3 +++
 debian/installer/modules/sata-modules | 3 ---
 debian/installer/modules/scsi-modules | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb2874d4a..0e50aadd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ linux (4.15~rc8-1~exp2) UNRELEASED; urgency=medium
     IPV6_SEG6_HMAC, NF_LOG_NETDEV, IP_SET_HASH_IPMAC, NET_ACT_SAMPLE,
     IPVTAP, VIRTIO_MMIO, CRYPTO_RSA, CRYPTO_DH, CRYPTO_ECDH.
   * x86: Enable SCHED_MC_PRIO, HYPERV_VSOCKETS.
+  * Enable NVME_MULTIPATH, NVME_FC, NVME_TARGET_FC, move nvme module into
+    scsi-modules installer udeb.
 
  -- Bastian Blank <waldi@debian.org>  Thu, 18 Jan 2018 09:14:57 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 78efe4645..5d772baba 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3886,7 +3886,9 @@ CONFIG_NVDIMM_DAX=y
 ## file: drivers/nvme/host/Kconfig
 ##
 CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
 
 ##
 ## file: drivers/nvme/target/Kconfig
@@ -3894,6 +3896,7 @@ CONFIG_NVME_RDMA=m
 CONFIG_NVME_TARGET=m
 # CONFIG_NVME_TARGET_LOOP is not set
 CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
 
 ##
 ## file: drivers/of/Kconfig
diff --git a/debian/installer/modules/sata-modules b/debian/installer/modules/sata-modules
index e3be90bd3..da038b739 100644
--- a/debian/installer/modules/sata-modules
+++ b/debian/installer/modules/sata-modules
@@ -11,6 +11,3 @@ ata_piix ?
 sx8 ?
 pdc_adma ?
 mtip32xx ?
-
-# XXX not actually SATA
-nvme ?
diff --git a/debian/installer/modules/scsi-modules b/debian/installer/modules/scsi-modules
index 2b24b5431..24f409957 100644
--- a/debian/installer/modules/scsi-modules
+++ b/debian/installer/modules/scsi-modules
@@ -47,3 +47,6 @@ drivers/scsi/scsi_transport_* -
 fcoe -
 raid_class -
 scsi_debug -
+
+# XXX not actually SCSI
+nvme ?