patches for DPDK stable branches
 help / color / mirror / Atom feed
From: christian.ehrhardt@canonical.com
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'eal/freebsd: add missing C++ include guards' has been queued to stable release 19.11.12
Date: Thu, 17 Mar 2022 15:17:43 +0100	[thread overview]
Message-ID: <20220317141747.1955930-5-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20220317141747.1955930-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.12

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

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 66be196f77ff1ae5df42446e49041f6f99c4fe5b Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 11 Mar 2022 20:05:19 +0000
Subject: [PATCH] eal/freebsd: add missing C++ include guards

[ upstream commit 29fd052dcc3be76112bc7b03a918308ebcf901d8 ]

Add missing 'extern "C"' to file.

Fixes: 428eb983f5f7 ("eal: add OS specific header file")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 lib/librte_eal/freebsd/eal/include/rte_os.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/librte_eal/freebsd/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h
index c16f2a30e9..78ee6fd8f4 100644
--- a/lib/librte_eal/freebsd/eal/include/rte_os.h
+++ b/lib/librte_eal/freebsd/eal/include/rte_os.h
@@ -5,6 +5,10 @@
 #ifndef _RTE_OS_H_
 #define _RTE_OS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * This header should contain any definition
  * which is not supported natively or named differently in FreeBSD.
@@ -48,4 +52,8 @@ typedef cpuset_t rte_cpuset_t;
 } while (0)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_OS_H_ */
-- 
2.35.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-17 14:33:42.207952321 +0100
+++ 0005-eal-freebsd-add-missing-C-include-guards.patch	2022-03-17 14:33:41.872623036 +0100
@@ -1 +1 @@
-From 29fd052dcc3be76112bc7b03a918308ebcf901d8 Mon Sep 17 00:00:00 2001
+From 66be196f77ff1ae5df42446e49041f6f99c4fe5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 29fd052dcc3be76112bc7b03a918308ebcf901d8 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -13 +14 @@
- lib/eal/freebsd/include/rte_os.h | 8 ++++++++
+ lib/librte_eal/freebsd/eal/include/rte_os.h | 8 ++++++++
@@ -16,4 +17,4 @@
-diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h
-index 9d8a69008c..b4afd45adc 100644
---- a/lib/eal/freebsd/include/rte_os.h
-+++ b/lib/eal/freebsd/include/rte_os.h
+diff --git a/lib/librte_eal/freebsd/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h
+index c16f2a30e9..78ee6fd8f4 100644
+--- a/lib/librte_eal/freebsd/eal/include/rte_os.h
++++ b/lib/librte_eal/freebsd/eal/include/rte_os.h
@@ -31 +32 @@
-@@ -59,4 +63,8 @@ typedef cpuset_t rte_cpuset_t;
+@@ -48,4 +52,8 @@ typedef cpuset_t rte_cpuset_t;

  parent reply	other threads:[~2022-03-17 14:17 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-17 14:17 patch 'vhost: fix queue number check when setting inflight FD' " christian.ehrhardt
2022-03-17 14:17 ` patch 'vhost: fix FD leak with inflight messages' " christian.ehrhardt
2022-03-17 14:17 ` patch 'app/testpmd: fix show RSS RETA on Windows' " christian.ehrhardt
2022-03-17 14:17 ` patch 'examples/l3fwd: fix buffer overflow in Tx' " christian.ehrhardt
2022-03-17 14:17 ` christian.ehrhardt [this message]
2022-03-17 14:17 ` patch 'compressdev: fix missing space in log macro' " christian.ehrhardt
2022-03-17 14:17 ` patch 'cryptodev: fix clang C++ include' " christian.ehrhardt
2022-03-17 14:17 ` patch 'raw/ifpga: fix build with optimization' " christian.ehrhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220317141747.1955930-5-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=bruce.richardson@intel.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).