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 06844A055A for ; Thu, 27 Feb 2020 10:35:48 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F09561C01; Thu, 27 Feb 2020 10:35:47 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id 9199E1C000 for ; Thu, 27 Feb 2020 10:35:46 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id r17so2412527wrj.7 for ; Thu, 27 Feb 2020 01:35:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3zPOFca8Ogne22G3KQWwlaE5oM6UiTg2MgbLgZ3l3J4=; b=FLxkpRiP9hFxOG7ta9ShXR6XWF+L1s8DBkkmp325zyJo+XxnmkV51odiwttVRhSMKk ZTE8QS2PnmAF5UvkdTQVR0W+F1uD096BHQmYdSIPrzVVQB8eIQrvWpD2ZBknNZdZmW07 mUZKFL15d5e69VTtsaJ4cYBzrRFlDcepasLcq2zASGlZTwwVaiO4TaK4X5IOWZE0fvQN AZEb5ch2CHmJXThnrgWlRSWm85lUWiXBiUJB5ADU/K8Jqa09+pYmG8XocTtBd2C13x4W KRzSdMXIvaxDKm+AY4Mkla8fBL0fmE6FvMF5rziAU/jxDlA85FYMwRczmwXfsluSWVsN s5Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3zPOFca8Ogne22G3KQWwlaE5oM6UiTg2MgbLgZ3l3J4=; b=JitdI1ppMU/iVIG4+A47vSEQEDh7axuEsw6ugCRb98OS2SIxr7MWkDqu9ruerDSiBq VlFsX61WG+cLKKrVK+9YTY58z6gF2Fdt0NISDi+Qh9aSIpromv1MUJLVxp4IeXNE9x7F ZWCRpXZ5XTJqjQEiuVty6FxNJgXAx4zIyjVdAJtGhK9xZVDZN863gTxKC/r3hjTmlwZF lD0PiejqhdV8zAernPdGqhLVC2rLYfTjxmfepZTFIYXX8YjxF/Uq0HjCU/70v618nMUm wmKLKBklgpclDh1zAxAPg3tbqVV1f4U60HcTtXrtXDOb7U+fTvUC5d/a4sSbH+0yPV5k r06A== X-Gm-Message-State: APjAAAXDfNx2vv7Xf6g+VGCj1t/evB/eAJlVDd+MtR1K9bBXm+bjyMNg ZWS5KnrAU1q+ntzd5Lcgdi05f4cEbRA= X-Google-Smtp-Source: APXvYqyLJungKfAIcuA49WAN+gdoaLYiX2hOrTilzwCQsA2EtZ/vrRCVP8rsA0wmkqH7p3dadhVkkA== X-Received: by 2002:adf:b19d:: with SMTP id q29mr3731023wra.211.1582796145697; Thu, 27 Feb 2020 01:35:45 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h18sm7013469wrv.78.2020.02.27.01.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2020 01:35:45 -0800 (PST) From: luca.boccassi@gmail.com To: Prateek Agarwal Cc: Honnappa Nagarahalli , dpdk stable Date: Thu, 27 Feb 2020 09:33:59 +0000 Message-Id: <20200227093402.17690-39-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200227093402.17690-1-luca.boccassi@gmail.com> References: <20200217174546.25334-54-luca.boccassi@gmail.com> <20200227093402.17690-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix multi-producer enqueue figure in ring guide' has been queued to stable release 19.11.1 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 stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/29/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. Thanks. Luca Boccassi --- >From 5654f42d4fa520144d8d692d0f70d855d1e0a917 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/prog_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 @@ -16,7 +16,7 @@ height="403.06647" id="svg3388" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.4 (f8dce91, 2019-08-02)" sodipodi:docname="ring-mp-enqueue3.svg"> @@ -359,15 +359,15 @@ inkscape:pageshadow="2" inkscape:zoom="1.4" inkscape:cx="201.35119" - inkscape:cy="221.79811" + inkscape:cy="107.5124" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" - inkscape:window-width="958" - inkscape:window-height="1002" - inkscape:window-x="223" - inkscape:window-y="22" - inkscape:window-maximized="0" + inkscape:window-width="1313" + inkscape:window-height="713" + inkscape:window-x="53" + inkscape:window-y="27" + inkscape:window-maximized="1" inkscape:snap-grids="false" inkscape:snap-to-guides="true" showguides="false" @@ -382,8 +382,10 @@ visible="true" enabled="true" snapvisiblegridlinesonly="true" - originx="-162.97143px" - originy="-370.03525px" /> + originx="-162.97143" + originy="-370.03525" + spacingx="1" + spacingy="1" /> @@ -393,7 +395,7 @@ image/svg+xml - + @@ -490,37 +492,37 @@ obj1 + y="495.49646" + style="font-size:14px;line-height:1.25">obj1 obj2 + y="495.49646" + style="font-size:14px;line-height:1.25">obj2 obj3 + y="495.49646" + style="font-size:14px;line-height:1.25">obj3 cons_head + y="589.505" + style="font-size:14px;line-height:1.25">cons_head cons_tail + y="603.41034" + style="font-size:14px;line-height:1.25">cons_tail prod_head + x="567.01239" + y="587.9577" + style="font-size:14px;line-height:1.25">prod_head prod_tail + y="602.57739" + style="font-size:14px;line-height:1.25">prod_tail local variableslocal variablescore 2 + id="tspan4150" + style="font-size:14px;line-height:1.25">core 2 structure state + y="664.09021" + style="font-size:14px;line-height:1.25">structure state cons_tail + y="401.48123" + style="font-size:14px;line-height:1.25">cons_tail prod_head + y="401.48123" + style="font-size:14px;line-height:1.25">prod_head prod_next + y="401.48123" + style="font-size:14px;line-height:1.25">prod_next local variableslocal variablescore 1 + id="tspan4152" + style="font-size:14px;line-height:1.25">core 1 cons_tail + y="328.57767" + style="font-size:14px;line-height:1.25">cons_tail prod_head + y="328.57767" + style="font-size:14px;line-height:1.25">prod_head prod_next + y="328.57767" + style="font-size:14px;line-height:1.25">prod_next compare and swap succeedscompare and swap succeedson core 2 + id="tspan3324" + style="font-size:14px;line-height:1.25">on core 2 obj4 + y="495.49646" + style="font-size:14px;line-height:1.25">obj4 obj5 + y="496.00156" + style="font-size:14px;line-height:1.25">obj5 -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-27 09:31:57.055537538 +0000 +++ 0039-doc-fix-multi-producer-enqueue-figure-in-ring-guide.patch 2020-02-27 09:31:55.839946635 +0000 @@ -1,13 +1,14 @@ -From fa00525b9a546e166cca31f49f2512187ebe0db2 Mon Sep 17 00:00:00 2001 +From 5654f42d4fa520144d8d692d0f70d855d1e0a917 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") -Cc: stable@dpdk.org Signed-off-by: Prateek Agarwal Signed-off-by: Honnappa Nagarahalli