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 36CC8A04C3 for ; Fri, 22 Nov 2019 15:42:27 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D9A22BBB; Fri, 22 Nov 2019 15:42:27 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 40CC58F96 for ; Fri, 22 Nov 2019 15:42:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433745; 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=3FQsL2snHqZ1cgQIPbzCDVjbE7QIsI9Ct2e/J7Kv24k=; b=a9mwFHSwvhTlj8b6VNRdGOGSxoC9Bnr2TZfO+PsFKbL3ZZrIia1vAquhNupXE4kKKTd7eX fcjtQj7ldZSblaNQXnIRh82j0e5goE/MX12ndhH0VIuGe8HdEHhnIL3OI6j1x5nKWuOQfJ AhsXlklYhrYI3h1YUE0SPI22D72ElRU= 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-13-UtVEYFOdMYiAqdVHojIJiw-1; Fri, 22 Nov 2019 09:42:22 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 618BF184CAA3; Fri, 22 Nov 2019 14:42:21 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C2556E713; Fri, 22 Nov 2019 14:42:18 +0000 (UTC) From: Kevin Traynor To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Fri, 22 Nov 2019 14:41:06 +0000 Message-Id: <20191122144131.21231-20-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: UtVEYFOdMYiAqdVHojIJiw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: fix typo in virtio in-order Rx function name' 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 11/29/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/ef42cce19947f725f6= e3439e7ae30e1fff1a447c Thanks. Kevin. --- >From ef42cce19947f725f6e3439e7ae30e1fff1a447c Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Tue, 13 Aug 2019 10:07:26 +0800 Subject: [PATCH] doc: fix typo in virtio in-order Rx function name [ upstream commit 3afba6e92e1797934181093879b2f4bd2f23ad1b ] The Rx function that will be used when in-order is enabled should be virtio_recv_mergeable_pkts_inorder() instead of virtio_xmit_pkts_inorder(). Fixes: 8f3bd7e8702d ("net/virtio: add in-order Rx/Tx into selection") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- doc/guides/nics/virtio.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/nics/virtio.rst b/doc/guides/nics/virtio.rst index da9cd6ba6..08438d064 100644 --- a/doc/guides/nics/virtio.rst +++ b/doc/guides/nics/virtio.rst @@ -252,5 +252,5 @@ In-order callbacks only work on simulated virtio user v= dev. =20 * For Rx: If mergeable Rx buffers is enabled and in-order is enabled the= n - ``virtio_xmit_pkts_inorder`` is used. + ``virtio_recv_mergeable_pkts_inorder`` is used. =20 * For Tx: If in-order is enabled then ``virtio_xmit_pkts_inorder`` is us= ed. --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.308388879 +0000 +++ 0020-doc-fix-typo-in-virtio-in-order-Rx-function-name.patch=092019-11-2= 2 14:36:55.189149457 +0000 @@ -1 +1 @@ -From 3afba6e92e1797934181093879b2f4bd2f23ad1b Mon Sep 17 00:00:00 2001 +From ef42cce19947f725f6e3439e7ae30e1fff1a447c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3afba6e92e1797934181093879b2f4bd2f23ad1b ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org