From 16886d2fa305cdd757dffd7c40d5de1329ab3624 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 6 Aug 2020 03:55:20 +0000 Subject: [PATCH] qla2x00t-32gbit: Fix Linux kernel v5.6 build (merge r8868 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.4.x@9107 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_nvme.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c index 110dbc09f..262c288bc 100644 --- a/qla2x00t-32gbit/qla_nvme.c +++ b/qla2x00t-32gbit/qla_nvme.c @@ -621,11 +621,12 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) } static struct nvme_fc_port_template qla_nvme_fc_transport = { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(5, 7, 0) +#if 0 /* * See also commit 863fbae929c7 ("nvme_fc: add module to ops template - * to allow module references"). + * to allow module references"). See also commit 8c5c66052920 + * ("nvme-fc: Revert "add module to ops template to allow module + * references"") # v5.7-rc1. */ .module = THIS_MODULE, #endif