[dpdk-stable] patch 'doc: fix typo in pcap guide' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/24/20. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/f46a8b96235e311d086d1c3d485104cfda8b76ad

Thanks.

Kevin.

---
>From f46a8b96235e311d086d1c3d485104cfda8b76ad Mon Sep 17 00:00:00 2001
From: Sarosh Arif <sarosh.arif at emumba.com>
Date: Wed, 14 Oct 2020 17:23:41 +0500
Subject: [PATCH] doc: fix typo in pcap guide

[ upstream commit a09272436e5a60d9dedd901ecf261daade69fb90 ]

Changed "net_pcap1;" to "net_pcap1," in order to make the command
correct.

Fixes: 53bf48403409 ("net/pcap: capture only ingress packets from Rx iface")

Signed-off-by: Sarosh Arif <sarosh.arif at emumba.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 doc/guides/nics/pcap_ring.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/nics/pcap_ring.rst b/doc/guides/nics/pcap_ring.rst
index c1ef9196bf..f3364106c1 100644
--- a/doc/guides/nics/pcap_ring.rst
+++ b/doc/guides/nics/pcap_ring.rst
@@ -139,5 +139,5 @@ Forward packets through two network interfaces:
 
     $RTE_TARGET/app/testpmd -l 0-3 -n 4 \
-        --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1;iface=eth1'
+        --vdev 'net_pcap0,iface=eth0' --vdev='net_pcap1,iface=eth1'
 
 Enable 2 tx queues on a network interface:
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-18 16:33:38.263290014 +0000
+++ 0015-doc-fix-typo-in-pcap-guide.patch	2020-11-18 16:33:37.916215054 +0000
@@ -1 +1 @@
-From a09272436e5a60d9dedd901ecf261daade69fb90 Mon Sep 17 00:00:00 2001
+From f46a8b96235e311d086d1c3d485104cfda8b76ad Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a09272436e5a60d9dedd901ecf261daade69fb90 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index cf230ae40a..8fdb49179a 100644
+index c1ef9196bf..f3364106c1 100644
@@ -22 +23 @@
-@@ -167,5 +167,5 @@ Forward packets through two network interfaces:
+@@ -139,5 +139,5 @@ Forward packets through two network interfaces: