[dpdk-stable] patch 'eal: fix comment of OS-specific header files' has been queued to stable release 19.11.9

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.9

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

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From ac0f0e81d97c56a0269ac293e8521ae2c560c172 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Thu, 25 Feb 2021 00:16:22 +0100
Subject: [PATCH] eal: fix comment of OS-specific header files

[ upstream commit bfb42c3777a82717bfc8da0169a932fe344f22b5 ]

The same comment is on top of each rte_os.h file.
It is reworded to remove the mention of "future releases".

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

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
Acked-by: David Marchand <david.marchand at redhat.com>
---
 lib/librte_eal/freebsd/eal/include/rte_os.h | 5 ++---
 lib/librte_eal/linux/eal/include/rte_os.h   | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/librte_eal/freebsd/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h
index a5efe618f5..f384632f52 100644
--- a/lib/librte_eal/freebsd/eal/include/rte_os.h
+++ b/lib/librte_eal/freebsd/eal/include/rte_os.h
@@ -6,9 +6,8 @@
 #define _RTE_OS_H_
 
 /**
- * This is header should contain any function/macro definition
- * which are not supported natively or named differently in the
- * freebsd OS. Functions will be added in future releases.
+ * This header should contain any definition
+ * which is not supported natively or named differently in FreeBSD.
  */
 
 #include <pthread_np.h>
diff --git a/lib/librte_eal/linux/eal/include/rte_os.h b/lib/librte_eal/linux/eal/include/rte_os.h
index 218d4fa86e..390b87b3a1 100644
--- a/lib/librte_eal/linux/eal/include/rte_os.h
+++ b/lib/librte_eal/linux/eal/include/rte_os.h
@@ -6,9 +6,8 @@
 #define _RTE_OS_H_
 
 /**
- * This is header should contain any function/macro definition
- * which are not supported natively or named differently in the
- * linux OS. Functions will be added in future releases.
+ * This header should contain any definition
+ * which is not supported natively or named differently in Linux.
  */
 
 #include <sched.h>
-- 
2.31.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-17 17:40:31.048994019 +0200
+++ 0038-eal-fix-comment-of-OS-specific-header-files.patch	2021-05-17 17:40:29.171809476 +0200
@@ -1 +1 @@
-From bfb42c3777a82717bfc8da0169a932fe344f22b5 Mon Sep 17 00:00:00 2001
+From ac0f0e81d97c56a0269ac293e8521ae2c560c172 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bfb42c3777a82717bfc8da0169a932fe344f22b5 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -16,4 +17,3 @@
- lib/librte_eal/freebsd/include/rte_os.h | 5 ++---
- lib/librte_eal/linux/include/rte_os.h   | 5 ++---
- lib/librte_eal/windows/include/rte_os.h | 5 ++---
- 3 files changed, 6 insertions(+), 9 deletions(-)
+ lib/librte_eal/freebsd/eal/include/rte_os.h | 5 ++---
+ lib/librte_eal/linux/eal/include/rte_os.h   | 5 ++---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
@@ -21,4 +21,4 @@
-diff --git a/lib/librte_eal/freebsd/include/rte_os.h b/lib/librte_eal/freebsd/include/rte_os.h
-index eeb750cd81..c16f2a30e9 100644
---- a/lib/librte_eal/freebsd/include/rte_os.h
-+++ b/lib/librte_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 a5efe618f5..f384632f52 100644
+--- a/lib/librte_eal/freebsd/eal/include/rte_os.h
++++ b/lib/librte_eal/freebsd/eal/include/rte_os.h
@@ -37 +37 @@
-diff --git a/lib/librte_eal/linux/include/rte_os.h b/lib/librte_eal/linux/include/rte_os.h
+diff --git a/lib/librte_eal/linux/eal/include/rte_os.h b/lib/librte_eal/linux/eal/include/rte_os.h
@@ -39,2 +39,2 @@
---- a/lib/librte_eal/linux/include/rte_os.h
-+++ b/lib/librte_eal/linux/include/rte_os.h
+--- a/lib/librte_eal/linux/eal/include/rte_os.h
++++ b/lib/librte_eal/linux/eal/include/rte_os.h
@@ -53,16 +52,0 @@
-diff --git a/lib/librte_eal/windows/include/rte_os.h b/lib/librte_eal/windows/include/rte_os.h
-index 7ef38ff06c..f0512f20a6 100644
---- a/lib/librte_eal/windows/include/rte_os.h
-+++ b/lib/librte_eal/windows/include/rte_os.h
-@@ -6,9 +6,8 @@
- #define _RTE_OS_H_
- 
- /**
-- * This is header should contain any function/macro definition
-- * which are not supported natively or named differently in the
-- * Windows OS. It must not include Windows-specific headers.
-+ * This header should contain any definition
-+ * which is not supported natively or named differently in Windows.
-  */
- 
- #include <stdarg.h>