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 274AEA0561 for ; Thu, 27 Feb 2020 18:39:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1EFCB2C02; Thu, 27 Feb 2020 18:39:51 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id AC53D1BFAB for ; Thu, 27 Feb 2020 18:39:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582825189; 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=+o0E0AAUiCuER1IqTECSwU8qM55BjBrheTj0+m0Xptc=; b=HRwT36M0Gbr9pyr60d84cg4UV4MzNcRlypp5Vi39oD0GMyC7BuTMcV+lCGfP9UORDFhfkg V+XqzCANoIhJY9f1tx097iLzdz5opmWzd62AnXTiGG53S0LQUb4cvKeytX2hu9rBSJUBjy y6oZrRR33tYYE/a/ZOmYESwBzlivGQk= 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-270-zsZTDLIQMde_P1dZJBYfoQ-1; Thu, 27 Feb 2020 12:39:42 -0500 X-MC-Unique: zsZTDLIQMde_P1dZJBYfoQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AAD6107ACC5; Thu, 27 Feb 2020 17:39:41 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.123]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6967A8AC42; Thu, 27 Feb 2020 17:39:35 +0000 (UTC) From: Kevin Traynor To: Prateek Agarwal Cc: Honnappa Nagarahalli , dpdk stable Date: Thu, 27 Feb 2020 17:38:07 +0000 Message-Id: <20200227173807.28004-16-ktraynor@redhat.com> In-Reply-To: <20200227173807.28004-1-ktraynor@redhat.com> References: <20200227173807.28004-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: fix multi-producer enqueue figure in ring guide' has been queued to LTS release 18.11.7 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/02/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 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/1050ff089a94229165= 996c618fff440dfcc3d4c7 Thanks. Kevin. --- >From 1050ff089a94229165996c618fff440dfcc3d4c7 Mon Sep 17 00:00:00 2001 From: Prateek Agarwal Date: Wed, 19 Feb 2020 15:05:30 -0600 Subject: [PATCH] doc: fix multi-producer enqueue figure in ring guide [ upstream commit fa00525b9a546e166cca31f49f2512187ebe0db2 ] The producer head pointer in multi producer enqueue fig.6.10 points to incorrect object in the ring array. Fixes: fc1f2750a3ec ("doc: programmers guide") Signed-off-by: Prateek Agarwal Signed-off-by: Honnappa Nagarahalli --- .../prog_guide/img/ring-mp-enqueue3.svg | 193 +++++++++--------- 1 file changed, 99 insertions(+), 94 deletions(-) diff --git a/doc/guides/prog_guide/img/ring-mp-enqueue3.svg b/doc/guides/pr= og_guide/img/ring-mp-enqueue3.svg index da483b031e..83ef7dba13 100644 --- a/doc/guides/prog_guide/img/ring-mp-enqueue3.svg +++ b/doc/guides/prog_guide/img/ring-mp-enqueue3.svg @@ -17,5 +17,5 @@ id=3D"svg3388" version=3D"1.1" - inkscape:version=3D"0.48.4 r9939" + inkscape:version=3D"0.92.4 (f8dce91, 2019-08-02)" sodipodi:docname=3D"ring-mp-enqueue3.svg"> + originx=3D"-162.97143" + originy=3D"-370.03525" + spacingx=3D"1" + spacingy=3D"1" /> - + @@ -491,35 +493,35 @@ obj1 + y=3D"495.49646" + style=3D"font-size:14px;line-height:1.25">obj1 obj2 + y=3D"495.49646" + style=3D"font-size:14px;line-height:1.25">obj2 obj3 + y=3D"495.49646" + style=3D"font-size:14px;line-height:1.25">obj3 cons_head + y=3D"589.505" + style=3D"font-size:14px;line-height:1.25">cons_head cons_tail + y=3D"603.41034" + style=3D"font-size:14px;line-height:1.25">cons_tail prod_head + x=3D"567.01239" + y=3D"587.9577" + style=3D"font-size:14px;line-height:1.25">prod_head prod_tail + y=3D"602.57739" + style=3D"font-size:14px;line-height:1.25">prod_tail local variableslocal variables= core 2 + id=3D"tspan4150" + style=3D"font-size:14px;line-height:1.25">core 2 structure state + y=3D"664.09021" + style=3D"font-size:14px;line-height:1.25">structure state= cons_tail + y=3D"401.48123" + style=3D"font-size:14px;line-height:1.25">cons_tail prod_head + y=3D"401.48123" + style=3D"font-size:14px;line-height:1.25">prod_head prod_next + y=3D"401.48123" + style=3D"font-size:14px;line-height:1.25">prod_next local variableslocal variables= core 1 + id=3D"tspan4152" + style=3D"font-size:14px;line-height:1.25">core 1 cons_tail + y=3D"328.57767" + style=3D"font-size:14px;line-height:1.25">cons_tail prod_head + y=3D"328.57767" + style=3D"font-size:14px;line-height:1.25">prod_head prod_next + y=3D"328.57767" + style=3D"font-size:14px;line-height:1.25">prod_next compare and swap succeedscompare and swap succee= dson core 2 + id=3D"tspan3324" + style=3D"font-size:14px;line-height:1.25">on core 2 obj4 + y=3D"495.49646" + style=3D"font-size:14px;line-height:1.25">obj4 obj5 + y=3D"496.00156" + style=3D"font-size:14px;line-height:1.25">obj5 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-27 17:26:24.673064749 +0000 +++ 0016-doc-fix-multi-producer-enqueue-figure-in-ring-guide.patch=092020-0= 2-27 17:26:23.690830267 +0000 @@ -1 +1 @@ -From fa00525b9a546e166cca31f49f2512187ebe0db2 Mon Sep 17 00:00:00 2001 +From 1050ff089a94229165996c618fff440dfcc3d4c7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fa00525b9a546e166cca31f49f2512187ebe0db2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org