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 0185AA04F0 for ; Tue, 10 Dec 2019 16:00:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E882A1BE84; Tue, 10 Dec 2019 16:00:16 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id E61731BE84 for ; Tue, 10 Dec 2019 16:00:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990015; 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=HYvQV/XrYD9AuYD8sEiHKDSmJpzOa6tEOiol9Nv1zhw=; b=TkdV6+rFrbdUF+vc9zB1ftDwxsvlRru/o1xyHRURzeG9jK7WMV5dbCG3ICD84NDofAmkSK o7C3Yudrbn8m/BfWTa9gEQ9IZcOYz7KiPZWzdYTpAUtfQMKs1P+vKkaed5gCjf1gUmCws4 UeKZHo/qf+MDRGiHz+o77lNl2/DA6/k= 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-254-51BlYQq5NxeGBBJGJWPJIg-1; Tue, 10 Dec 2019 10:00:13 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B14F1883525; Tue, 10 Dec 2019 15:00:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 69A085D9C5; Tue, 10 Dec 2019 15:00:11 +0000 (UTC) From: Kevin Traynor To: Thierry Herbelot Cc: Ferruh Yigit , dpdk stable Date: Tue, 10 Dec 2019 14:58:42 +0000 Message-Id: <20191210145937.32755-8-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 51BlYQq5NxeGBBJGJWPJIg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: fix a common typo in NIC guides' has been queued to LTS release 18.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/16/19. 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 rebasi= ng (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/3135b799ad5dc0af34= 8efd7377652eff64d96d13 Thanks. Kevin. --- >From 3135b799ad5dc0af348efd7377652eff64d96d13 Mon Sep 17 00:00:00 2001 From: Thierry Herbelot Date: Fri, 18 Oct 2019 17:06:57 +0200 Subject: [PATCH] doc: fix a common typo in NIC guides [ upstream commit e599bbf442f502fce0671f6b6f39f728b14259a7 ] 'CRC striping' should be spelled 'CRC stripping'. Fixes: 3eee1f067e7c ("fm10k: add guide") Fixes: 7a4d9f6676d7 ("doc: add liquidio") Fixes: f820b5896631 ("doc: add octeontx ethdev driver documentation") Fixes: 920717e4d8ba ("net/octeontx2: add device start operation") Fixes: f994cecafdcf ("doc: add ThunderX nicvf") Signed-off-by: Thierry Herbelot Reviewed-by: Ferruh Yigit --- doc/guides/nics/fm10k.rst | 4 ++-- doc/guides/nics/liquidio.rst | 4 ++-- doc/guides/nics/octeontx.rst | 4 ++-- doc/guides/nics/thunderx.rst | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guides/nics/fm10k.rst b/doc/guides/nics/fm10k.rst index 764e089c8..20a1cde53 100644 --- a/doc/guides/nics/fm10k.rst +++ b/doc/guides/nics/fm10k.rst @@ -136,6 +136,6 @@ sent to the app, which can then restart the FM10000 por= t to resume network processing. =20 -CRC striping -~~~~~~~~~~~~ +CRC stripping +~~~~~~~~~~~~~ =20 The FM10000 family of NICs strip the CRC for every packets coming into the diff --git a/doc/guides/nics/liquidio.rst b/doc/guides/nics/liquidio.rst index e2a38004d..053414672 100644 --- a/doc/guides/nics/liquidio.rst +++ b/doc/guides/nics/liquidio.rst @@ -191,6 +191,6 @@ Ring size Number of descriptors for Rx/Tx ring should be in the range 128 to 512. =20 -CRC striping -~~~~~~~~~~~~ +CRC stripping +~~~~~~~~~~~~~ =20 LiquidIO adapters strip ethernet FCS of every packet coming to the host in= terface. diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index f8111d3cc..970874cae 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -162,6 +162,6 @@ as it is the most performance effective way for packet = allocation and Tx buffer recycling on OCTEON TX SoC platform. =20 -CRC striping -~~~~~~~~~~~~ +CRC stripping +~~~~~~~~~~~~~ =20 The OCTEON TX SoC family NICs strip the CRC for every packets coming into = the diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index e84eaafe5..9252e2fb7 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -332,6 +332,6 @@ Limitations ----------- =20 -CRC striping -~~~~~~~~~~~~ +CRC stripping +~~~~~~~~~~~~~ =20 The ThunderX SoC family NICs strip the CRC for every packets coming into t= he --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:39.638288522 +0000 +++ 0008-doc-fix-a-common-typo-in-NIC-guides.patch=092019-12-10 14:49:38.99= 2458886 +0000 @@ -1 +1 @@ -From e599bbf442f502fce0671f6b6f39f728b14259a7 Mon Sep 17 00:00:00 2001 +From 3135b799ad5dc0af348efd7377652eff64d96d13 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e599bbf442f502fce0671f6b6f39f728b14259a7 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,6 +19,5 @@ - doc/guides/nics/fm10k.rst | 4 ++-- - doc/guides/nics/liquidio.rst | 4 ++-- - doc/guides/nics/octeontx.rst | 4 ++-- - doc/guides/nics/octeontx2.rst | 4 ++-- - doc/guides/nics/thunderx.rst | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) + doc/guides/nics/fm10k.rst | 4 ++-- + doc/guides/nics/liquidio.rst | 4 ++-- + doc/guides/nics/octeontx.rst | 4 ++-- + doc/guides/nics/thunderx.rst | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) @@ -52 +52 @@ -index 012a3ec21..3c19c912d 100644 +index f8111d3cc..970874cae 100644 @@ -64,13 +63,0 @@ -diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst -index 3b567a55e..fc8a130fb 100644 ---- a/doc/guides/nics/octeontx2.rst -+++ b/doc/guides/nics/octeontx2.rst -@@ -189,6 +189,6 @@ as it is performance wise most effective way for packe= t allocation and Tx buffer - recycling on OCTEON TX2 SoC platform. -=20 --CRC striping --~~~~~~~~~~~~ -+CRC stripping -+~~~~~~~~~~~~~ -=20 - The OCTEON TX2 SoC family NICs strip the CRC for every packet being recei= ved by @@ -78 +65 @@ -index 53eaec72a..3b75a9a9a 100644 +index e84eaafe5..9252e2fb7 100644