[dpdk-stable] patch 'bus/ifpga: fix build for cpp applications' has been queued to LTS release 18.11.1

Kevin Traynor ktraynor at redhat.com
Thu Feb 7 14:25:40 CET 2019


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 676587c9032e88eb72684a4d7eef1a5f193c6b7f Mon Sep 17 00:00:00 2001
From: Andy Pei <andy.pei at intel.com>
Date: Fri, 18 Jan 2019 11:09:33 +0000
Subject: [PATCH] bus/ifpga: fix build for cpp applications

[ upstream commit 03eab74ecb8d0249d655f2cd6c15abac764ca7d1 ]

Brackets unmatch when __cplusplus defined.

Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library")

Signed-off-by: Andy Pei <andy.pei at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/bus/ifpga/rte_bus_ifpga.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/ifpga/rte_bus_ifpga.h b/drivers/bus/ifpga/rte_bus_ifpga.h
index d53c0f483..0bf43ba88 100644
--- a/drivers/bus/ifpga/rte_bus_ifpga.h
+++ b/drivers/bus/ifpga/rte_bus_ifpga.h
@@ -14,5 +14,5 @@
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 #include <rte_bus.h>
@@ -144,3 +144,7 @@ RTE_PMD_EXPORT_NAME(nm, __COUNTER__)
 static const char *afudrvinit_ ## nm ## _alias = RTE_STR(alias)
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* _RTE_BUS_IFPGA_H_ */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-02-07 13:19:56.338533267 +0000
+++ 0034-bus-ifpga-fix-build-for-cpp-applications.patch	2019-02-07 13:19:55.000000000 +0000
@@ -1,12 +1,13 @@
-From 03eab74ecb8d0249d655f2cd6c15abac764ca7d1 Mon Sep 17 00:00:00 2001
+From 676587c9032e88eb72684a4d7eef1a5f193c6b7f Mon Sep 17 00:00:00 2001
 From: Andy Pei <andy.pei at intel.com>
 Date: Fri, 18 Jan 2019 11:09:33 +0000
 Subject: [PATCH] bus/ifpga: fix build for cpp applications
 
+[ upstream commit 03eab74ecb8d0249d655f2cd6c15abac764ca7d1 ]
+
 Brackets unmatch when __cplusplus defined.
 
 Fixes: 05fa3d4a6539 ("bus/ifpga: add Intel FPGA bus library")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Pei <andy.pei at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>


More information about the stable mailing list