[SRU][Bionic][PATCH 1/1] Revert "nvme: warn when finding multi-port subsystems without multipathing enabled"

Kleber Sacilotto de Souza kleber.souza at canonical.com
Wed Jul 31 16:28:10 UTC 2019


This reverts commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d.

Commit 993f70b886c0062fb5ec7c3c556d074bb3380b9d, which is
14a1336e6fff47dd1028b484d6c802105c58e2ee upstream, has been wrongly
backported to bionic/linux changing a different function, causing
the build to failure when CONFIG_NVM is disabled. The function which it
fixed isn't implemented yet on 4.15, so it can be safely reverted.

Signed-off-by: Kleber Sacilotto de Souza <kleber.souza at canonical.com>
 drivers/nvme/host/nvme.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 9fa97d79159a..324174325638 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -499,9 +499,6 @@ static inline int nvme_nvm_register(struct nvme_ns *ns, char *disk_name,
 static inline void nvme_nvm_unregister(struct nvme_ns *ns) {};
 static inline int nvme_nvm_register_sysfs(struct nvme_ns *ns)
-	if (ctrl->subsys->cmic & (1 << 3))
-		dev_warn(ctrl->device,
-"Please enable CONFIG_NVME_MULTIPATH for full support of multi-port devices.\n");
 	return 0;
 static inline void nvme_nvm_unregister_sysfs(struct nvme_ns *ns) {};

More information about the kernel-team mailing list