patch 'doc: remove reference to mbuf pkt field' has been queued to stable release 21.11.8
Kevin Traynor
ktraynor at redhat.com
Fri Aug 23 18:19:22 CEST 2024
Hi,
FYI, your patch has been queued to stable release 21.11.8
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/24. 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/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/1ab70cd4d8692854ea969a6b2ce18e598d56aacb
Thanks.
Kevin
---
>From 1ab70cd4d8692854ea969a6b2ce18e598d56aacb Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 3 Jul 2024 18:09:23 -0700
Subject: [PATCH] doc: remove reference to mbuf pkt field
[ upstream commit d9d1be537ea777059711ac313019ecd94840daba ]
The pkt union in mbuf was removed way back in 2014 but there
still was one leftover in the mbuf figure.
Fixes: ea672a8b1655 ("mbuf: remove the rte_pktmbuf structure")
Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
doc/guides/prog_guide/img/mbuf1.svg | 2 +-
doc/guides/prog_guide/img/mbuf2.svg | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/guides/prog_guide/img/mbuf1.svg b/doc/guides/prog_guide/img/mbuf1.svg
index a08bf3b6c0..111a874c00 100644
--- a/doc/guides/prog_guide/img/mbuf1.svg
+++ b/doc/guides/prog_guide/img/mbuf1.svg
@@ -488,5 +488,5 @@
id="tspan5256"
x="59.842155"
- y="282.37683">m->pkt.next = NULL</tspan></text>
+ y="282.37683">m->next = NULL</tspan></text>
<text
xml:space="preserve"
diff --git a/doc/guides/prog_guide/img/mbuf2.svg b/doc/guides/prog_guide/img/mbuf2.svg
index f6fdb54002..6a80cbc200 100644
--- a/doc/guides/prog_guide/img/mbuf2.svg
+++ b/doc/guides/prog_guide/img/mbuf2.svg
@@ -1075,5 +1075,5 @@
id="tspan5256-8"
x="527.19458"
- y="628.45935">m->pkt.next = NULL</tspan></text>
+ y="628.45935">m->next = NULL</tspan></text>
<text
xml:space="preserve"
@@ -1085,5 +1085,5 @@
id="tspan5256-8-3"
x="330.50363"
- y="628.45935">m->pkt.next = mseg3</tspan></text>
+ y="628.45935">m->next = mseg3</tspan></text>
<text
xml:space="preserve"
@@ -1095,5 +1095,5 @@
id="tspan5256-8-3-4"
x="144.79388"
- y="628.45935">m->pkt.next = mseg2</tspan></text>
+ y="628.45935">m->next = mseg2</tspan></text>
<text
xml:space="preserve"
--
2.46.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-08-23 17:18:13.696597442 +0100
+++ 0134-doc-remove-reference-to-mbuf-pkt-field.patch 2024-08-23 17:18:09.898430727 +0100
@@ -1 +1 @@
-From d9d1be537ea777059711ac313019ecd94840daba Mon Sep 17 00:00:00 2001
+From 1ab70cd4d8692854ea969a6b2ce18e598d56aacb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d9d1be537ea777059711ac313019ecd94840daba ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list