[dpdk-stable] patch 'kni: fix build on RHEL8 for arm and Power9' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/14/19. 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.

Thanks.

Kevin Traynor

---
>From a14239650e288b64b367221c27478e54a87edc0d Mon Sep 17 00:00:00 2001
From: David Zeng <zengxhsh at cn.ibm.com>
Date: Sat, 22 Dec 2018 00:27:33 +0800
Subject: [PATCH] kni: fix build on RHEL8 for arm and Power9

[ upstream commit 3d5501d568aacbcf71832691278f5656d3a9b649 ]

Signed-off-by: David Zeng <zengxhsh at cn.ibm.com>
Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 kernel/linux/kni/compat.h              | 8 +++++++-
 kernel/linux/kni/ethtool/igb/kcompat.h | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index bc81d0c8d..3c575c70a 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -103,7 +103,13 @@
 #endif
 
+/*
+ * RHEL has two different version with different kernel version:
+ * 3.10 is for AMD, Intel, IBM POWER7 and POWER8;
+ * 4.14 is for ARM and IBM POWER9
+ */
 #if (defined(RHEL_RELEASE_CODE) && \
 	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \
-	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)))
+	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)) && \
+	(LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)))
 #define ndo_change_mtu ndo_change_mtu_rh74
 #endif
diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
index 2681be684..430aabafe 100644
--- a/kernel/linux/kni/ethtool/igb/kcompat.h
+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
@@ -3932,5 +3932,6 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #if (defined(RHEL_RELEASE_CODE) && \
 	(RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 5)) && \
-	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)))
+	(RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0)) && \
+	(LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)))
 #define ndo_change_mtu ndo_change_mtu_rh74
 #endif
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:56.620173180 +0000
+++ 0046-kni-fix-build-on-RHEL8-for-arm-and-Power9.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,8 +1,10 @@
-From 3d5501d568aacbcf71832691278f5656d3a9b649 Mon Sep 17 00:00:00 2001
+From a14239650e288b64b367221c27478e54a87edc0d Mon Sep 17 00:00:00 2001
 From: David Zeng <zengxhsh at cn.ibm.com>
 Date: Sat, 22 Dec 2018 00:27:33 +0800
 Subject: [PATCH] kni: fix build on RHEL8 for arm and Power9
 
+[ upstream commit 3d5501d568aacbcf71832691278f5656d3a9b649 ]
+
 Signed-off-by: David Zeng <zengxhsh at cn.ibm.com>
 Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---