From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3701FA04DD for ; Wed, 18 Nov 2020 17:37:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CF18CC910; Wed, 18 Nov 2020 17:37:23 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 1B617C8F8 for ; Wed, 18 Nov 2020 17:37:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nJKR1r2pzgX/IqoWbQm0FsnmO6VBMexJvMoNilGlVFo=; b=OSHUQ4QXnlV6m9O9oo46uw20X4mnFdoBei9enY7jHjObRqBakCxdUbfUvVZrFDuVRSf5V7 5dtabgTM/MrqQeDFcH3wCAbHie2ffmcYWoJaQzydwIed9Gmmg+bg0wkhQTz9m2MbKJ9ubw tKZ8caKtPAHAUEunGcvMpiI2pKnhj0M= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-375-4BZXMzQIP5OpiPZTIvz7eQ-1; Wed, 18 Nov 2020 11:37:14 -0500 X-MC-Unique: 4BZXMzQIP5OpiPZTIvz7eQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82B0E6D278; Wed, 18 Nov 2020 16:36:43 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A56F5C1A3; Wed, 18 Nov 2020 16:36:42 +0000 (UTC) From: Kevin Traynor To: Sarosh Arif Cc: Ferruh Yigit , dpdk stable Date: Wed, 18 Nov 2020 16:35:01 +0000 Message-Id: <20201118163558.1101823-15-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'doc: fix typo in pcap guide' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Reviewed-by: Ferruh Yigit --- 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@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: