patch 'kni: fix build' has been queued to stable release 19.11.13

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.13

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 47978fa1489abac299449fd51330c5c3a78a0d30 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 6 Jun 2022 12:39:49 +0200
Subject: [PATCH] kni: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 327ef5065996356e1a4b77fb93c85737c99bb8fe ]

A previous fix had #else instead of #endif.
The error message is:
	kernel/linux/kni/kni_net.c: In function ‘kni_net_rx_normal’:
	kernel/linux/kni/kni_net.c:448:2: error: #else after #else

Bugzilla ID: 1025
Fixes: c98600d4bed6 ("kni: fix build with Linux 5.18")
Cc: stable at dpdk.org

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
---
 kernel/linux/kni/kni_net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 1270c367d8..46f3f5d669 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -415,7 +415,7 @@ kni_net_rx_normal(struct kni_dev *kni)
 		netif_rx_ni(skb);
 #else
 		netif_rx(skb);
-#else
+#endif
 
 		/* Update statistics */
 		dev->stats.rx_bytes += len;
-- 
2.37.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-07-07 09:54:14.697387942 +0200
+++ 0087-kni-fix-build.patch	2022-07-07 09:54:11.029825012 +0200
@@ -1 +1 @@
-From 327ef5065996356e1a4b77fb93c85737c99bb8fe Mon Sep 17 00:00:00 2001
+From 47978fa1489abac299449fd51330c5c3a78a0d30 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 327ef5065996356e1a4b77fb93c85737c99bb8fe ]
+
@@ -24 +26 @@
-index a8b092b756..41805fcabf 100644
+index 1270c367d8..46f3f5d669 100644
@@ -27 +29 @@
-@@ -445,7 +445,7 @@ kni_net_rx_normal(struct kni_dev *kni)
+@@ -415,7 +415,7 @@ kni_net_rx_normal(struct kni_dev *kni)