patch 'doc: fix typo depreciated instead of deprecated' has been queued to stable release 19.11.14
christian.ehrhardt at canonical.com
christian.ehrhardt at canonical.com
Wed Nov 16 11:40:09 CET 2022
Hi,
FYI, your patch has been queued to stable release 19.11.14
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/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/fc30e9e6e09b562dbcb4d768acba28d5d6ad275a
Thanks.
Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
>From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a Mon Sep 17 00:00:00 2001
From: Stephen Coleman <omegacoleman at gmail.com>
Date: Tue, 19 Apr 2022 17:01:02 +0800
Subject: [PATCH] doc: fix typo depreciated instead of deprecated
[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ]
Same issue was fixed in ABI policy in ec5c0f8,
but more of this misuse persist in comments and docs.
'depreciated' means diminish in value over a period of time.
It should not appear here.
Signed-off-by: Stephen Coleman <omegacoleman at gmail.com>
Acked-by: Ray Kinsella <mdr at ashroe.eu>
---
doc/guides/contributing/abi_policy.rst | 2 +-
doc/guides/contributing/abi_versioning.rst | 2 +-
lib/librte_kni/rte_kni.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/guides/contributing/abi_policy.rst b/doc/guides/contributing/abi_policy.rst
index 87942c8ac3..7d0a48e880 100644
--- a/doc/guides/contributing/abi_policy.rst
+++ b/doc/guides/contributing/abi_policy.rst
@@ -163,7 +163,7 @@ The requirements for changing the ABI are:
API becomes non-experimental, then the old one is marked with
``__rte_deprecated``.
- - The depreciated API should follow the notification process to be removed,
+ - The deprecated API should follow the notification process to be removed,
see :ref:`deprecation_notices`.
- At the declaration of the next major ABI version, those ABI changes then
diff --git a/doc/guides/contributing/abi_versioning.rst b/doc/guides/contributing/abi_versioning.rst
index ea9d99606b..6160fa1ef3 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -94,7 +94,7 @@ that library.
...
However when a new ABI version is declared, for example DPDK ``21``, old
-depreciated functions may be safely removed at this point and the entire old
+deprecated functions may be safely removed at this point and the entire old
major ABI version removed, see the section :ref:`deprecating_entire_abi` on
how this may be done.
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 855facd1a3..0028a4de83 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -66,8 +66,8 @@ struct rte_kni_conf {
uint32_t core_id; /* Core ID to bind kernel thread on */
uint16_t group_id; /* Group ID */
unsigned mbuf_size; /* mbuf size */
- struct rte_pci_addr addr; /* depreciated */
- struct rte_pci_id id; /* depreciated */
+ struct rte_pci_addr addr; /* deprecated */
+ struct rte_pci_id id; /* deprecated */
__extension__
uint8_t force_bind : 1; /* Flag to bind kernel thread */
--
2.38.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-11-16 11:36:50.948338709 +0100
+++ 0014-doc-fix-typo-depreciated-instead-of-deprecated.patch 2022-11-16 11:36:50.440775625 +0100
@@ -1 +1 @@
-From 98afdb15626841dd6580816678a6df63d12f22b9 Mon Sep 17 00:00:00 2001
+From fc30e9e6e09b562dbcb4d768acba28d5d6ad275a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 98afdb15626841dd6580816678a6df63d12f22b9 ]
+
@@ -16 +18 @@
- lib/kni/rte_kni.h | 4 ++--
+ lib/librte_kni/rte_kni.h | 4 ++--
@@ -20 +22 @@
-index 64919b6a2b..5fd4052585 100644
+index 87942c8ac3..7d0a48e880 100644
@@ -23 +25 @@
-@@ -167,7 +167,7 @@ The requirements for changing the ABI are:
+@@ -163,7 +163,7 @@ The requirements for changing the ABI are:
@@ -33 +35 @@
-index dd96527ee5..7afd1c1886 100644
+index ea9d99606b..6160fa1ef3 100644
@@ -39 +41 @@
- However when a new ABI version is declared, for example DPDK ``22``, old
+ However when a new ABI version is declared, for example DPDK ``21``, old
@@ -45,5 +47,5 @@
-diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h
-index 37d67509a0..1e508acc82 100644
---- a/lib/kni/rte_kni.h
-+++ b/lib/kni/rte_kni.h
-@@ -65,8 +65,8 @@ struct rte_kni_conf {
+diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
+index 855facd1a3..0028a4de83 100644
+--- a/lib/librte_kni/rte_kni.h
++++ b/lib/librte_kni/rte_kni.h
+@@ -66,8 +66,8 @@ struct rte_kni_conf {
More information about the stable
mailing list