[dpdk-stable] patch 'app/pdump: fix build with clang' has been queued to LTS release 18.11.7
Kevin Traynor
ktraynor at redhat.com
Fri Feb 14 18:03:36 CET 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.7
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/20/20. 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/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3cfe805b2d4eb746de9e940e6a922ad85a8c0bc7
Thanks.
Kevin.
---
>From 3cfe805b2d4eb746de9e940e6a922ad85a8c0bc7 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Sat, 25 Jan 2020 17:04:38 -0800
Subject: [PATCH] app/pdump: fix build with clang
[ upstream commit ab30f26aaaa025121bdf804152ade031ce9d7c0a ]
Clang checks indentation and found incorrect indentation in pdump.
app/pdump/main.c:598:3: error: misleading indentation;
statement is not part of the previous 'if'
[-Werror,-Wmisleading-indentation]
Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing")
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
app/pdump/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index ccf2a1d2f7..3f1bed89ff 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -557,5 +557,5 @@ configure_vdev(uint16_t port_id)
rte_exit(EXIT_FAILURE, "dev config failed\n");
- for (q = 0; q < txRings; q++) {
+ for (q = 0; q < txRings; q++) {
ret = rte_eth_tx_queue_setup(port_id, q, TX_DESC_PER_QUEUE,
rte_eth_dev_socket_id(port_id), NULL);
--
2.21.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-14 17:02:39.382358035 +0000
+++ 0042-app-pdump-fix-build-with-clang.patch 2020-02-14 17:02:37.062405622 +0000
@@ -1 +1 @@
-From ab30f26aaaa025121bdf804152ade031ce9d7c0a Mon Sep 17 00:00:00 2001
+From 3cfe805b2d4eb746de9e940e6a922ad85a8c0bc7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ab30f26aaaa025121bdf804152ade031ce9d7c0a ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 903d02f482..d05a023667 100644
+index ccf2a1d2f7..3f1bed89ff 100644
@@ -24 +25 @@
-@@ -596,5 +596,5 @@ configure_vdev(uint16_t port_id)
+@@ -557,5 +557,5 @@ configure_vdev(uint16_t port_id)
More information about the stable
mailing list