[dpdk-stable] patch 'Revert "kni: fix compilation on SLES15-SP3"' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/12/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/d1610c3b793e8458c9392f4f5dffe02f40d400cb

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From d1610c3b793e8458c9392f4f5dffe02f40d400cb Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt at canonical.com>
Date: Thu, 10 Jun 2021 10:24:05 +0200
Subject: [PATCH] Revert "kni: fix compilation on SLES15-SP3"

This reverts commit de7bca5de2e3d605ef9977bd6eba8aa565af01fd.
It was found that this breaks other SUSE versions.
We will pick the final fix from main once we have it.
---
 kernel/linux/kni/compat.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 70e014fd1d..5f65640d5e 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -133,9 +133,7 @@
 
 #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE || \
 	(defined(RHEL_RELEASE_CODE) && \
-	 RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE) || \
-	(defined(CONFIG_SUSE_KERNEL) && \
-	 KERNEL_VERSION(5, 3, 18) <= LINUX_VERSION_CODE)
+	 RHEL_RELEASE_VERSION(8, 3) <= RHEL_RELEASE_CODE)
 #define HAVE_TX_TIMEOUT_TXQUEUE
 #endif
 
-- 
2.31.1