From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id BC13E1B3B5 for ; Thu, 7 Feb 2019 14:28:08 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D38FC0D61B2; Thu, 7 Feb 2019 13:28:03 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DD308EC0F; Thu, 7 Feb 2019 13:28:01 +0000 (UTC) From: Kevin Traynor To: Andy Pei Cc: Ferruh Yigit , dpdk stable Date: Thu, 7 Feb 2019 13:25:40 +0000 Message-Id: <20190207132614.20538-34-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 07 Feb 2019 13:28:04 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/ifpga: fix build for cpp applications' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:09 -0000 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 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 Reviewed-by: Ferruh Yigit --- 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 @@ -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 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@dpdk.org Signed-off-by: Andy Pei Reviewed-by: Ferruh Yigit