patch 'doc: fix net drivers ordering' has been queued to stable release 19.11.14

christian.ehrhardt at canonical.com christian.ehrhardt at canonical.com
Wed Nov 16 11:40:11 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/03d079370f672771942dfeaf305892ef436aa948

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 03d079370f672771942dfeaf305892ef436aa948 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Tue, 11 Oct 2022 14:48:35 -0700
Subject: [PATCH] doc: fix net drivers ordering

[ upstream commit 5135eedeea910920f3351cb570dc40dd4fde23af ]

The list was not quite in alpha order, and it looked
like it should be.

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 doc/guides/nics/index.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index d61c27fdfa..555ed13e3f 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -26,6 +26,7 @@ Network Interface Controller Drivers
     ena
     enetc
     enic
+    fail_safe
     fm10k
     hinic
     hns3
@@ -33,9 +34,9 @@ Network Interface Controller Drivers
     ice
     ifc
     igb
+    intel_vf
     ipn3ke
     ixgbe
-    intel_vf
     kni
     liquidio
     memif
@@ -48,6 +49,7 @@ Network Interface Controller Drivers
     nfp
     octeontx
     octeontx2
+    pcap_ring
     pfe
     qede
     sfc_efx
@@ -56,8 +58,6 @@ Network Interface Controller Drivers
     tap
     thunderx
     vdev_netvsc
-    virtio
     vhost
+    virtio
     vmxnet3
-    pcap_ring
-    fail_safe
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-16 11:36:51.023653126 +0100
+++ 0016-doc-fix-net-drivers-ordering.patch	2022-11-16 11:36:50.448775675 +0100
@@ -1 +1 @@
-From 5135eedeea910920f3351cb570dc40dd4fde23af Mon Sep 17 00:00:00 2001
+From 03d079370f672771942dfeaf305892ef436aa948 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5135eedeea910920f3351cb570dc40dd4fde23af ]
+
@@ -11,2 +13,2 @@
- doc/guides/nics/index.rst | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ doc/guides/nics/index.rst | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -15 +17 @@
-index 12841ce407..df58a237ca 100644
+index d61c27fdfa..555ed13e3f 100644
@@ -18 +20,2 @@
-@@ -28,6 +28,7 @@ Network Interface Controller Drivers
+@@ -26,6 +26,7 @@ Network Interface Controller Drivers
+     ena
@@ -20 +22,0 @@
-     enetfec
@@ -24 +25,0 @@
-     gve
@@ -26,2 +27,4 @@
-@@ -37,10 +38,10 @@ Network Interface Controller Drivers
-     idpf
+     hns3
+@@ -33,9 +34,9 @@ Network Interface Controller Drivers
+     ice
+     ifc
@@ -29 +31,0 @@
-     igc
@@ -31 +32,0 @@
-     ionic
@@ -37,2 +38,2 @@
-     mana
-@@ -54,8 +55,9 @@ Network Interface Controller Drivers
+     memif
+@@ -48,6 +49,7 @@ Network Interface Controller Drivers
@@ -40,5 +41,2 @@
-     ngbe
-     null
--    octeontx
-     octeon_ep
-+    octeontx
+     octeontx
+     octeontx2
@@ -49 +47,2 @@
-@@ -64,8 +66,6 @@ Network Interface Controller Drivers
+@@ -56,8 +58,6 @@ Network Interface Controller Drivers
+     tap
@@ -51 +49,0 @@
-     txgbe


More information about the stable mailing list