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 19DB8A04DD for ; Wed, 28 Oct 2020 11:53:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F1799CA14; Wed, 28 Oct 2020 11:53:15 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 11EA5CA10 for ; Wed, 28 Oct 2020 11:53:15 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id n18so5170296wrs.5 for ; Wed, 28 Oct 2020 03:53:15 -0700 (PDT) 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=skfD4kV+FrKQ+k9ukUlrgcvN/0gBQix6vKf9JLOPk0I=; b=t0lwn9lTLJBKGmP4qvFBlKGv6MIeplid3gKftukN4dGMe/qlU3RxCPD7s3PBQjRPVY kCAoHLxuBx1nkxZqZW6fBybLZ2nOtDLridrl9ZbJaYQP0xf3YikqJ4x/CpAoLLXVSBtL WDprBD51KGkuEmafxLOD9odat25pCjtD8Ilr6NfWGBUz5Rx/zMM37roUhNN8TPhnoQFd Jh55yGLlJH3zbfglVFNnXnZCZVaWZR4DFWRPUSkiDSdbretGA90POmwPgdWXNb+riZj2 ++ZA31EmEzpY1CpjDFIdGhNSlsoXua9K48nkg7vEa/XHIGliTxilWj0WULcWAEw/fYYI m0sg== 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=skfD4kV+FrKQ+k9ukUlrgcvN/0gBQix6vKf9JLOPk0I=; b=T66XiZGVfXFbB12Ag4FN5ml+s60JG60SijKflUDmCzn9whKghWSq/jVv6F3gNpMcbh t2nkJNVNL1chjcao203Nw73RgXTLLwXcGZSW5wxqwZw7aec7CwVLfQtJ7kvmCBE1uTOt wyYoEe2eidVMpjxYuZn5Ui833Ib7fRr85yCIefr6yDaL9ZSjRqLnijLUUa08ICfzsObA 4dFSYG1GV3pFOPlHumhKxOyH1DB36gcr7W11rO6rU/BlIDwAJMUJohe4VbH8ZM4KomqU Mq8M5ymgJOBRgy5g67cpb3fjpPoa+ONxONoHQGQK7x+/hUVHD2W31TV/Sl7huPy0Bsjm ASjw== X-Gm-Message-State: AOAM531RQzO3YxlbfzJc7qo1yZ8fl7C9eklP/pOP+QPMvnivZf+KRljh Kj+qH7W6bFgAcIZm9qiUyro= X-Google-Smtp-Source: ABdhPJxalhKdEz9hvKRh2rciZetBpi+PnO1A9nSJJA7QyabwcYSEo/TvpCsF7vVRzC44yQ/hB2OQ6A== X-Received: by 2002:adf:ee4f:: with SMTP id w15mr2940280wro.298.1603882393807; Wed, 28 Oct 2020 03:53:13 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m1sm5876965wmm.34.2020.10.28.03.53.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Sachin Saxena Cc: dpdk stable Date: Wed, 28 Oct 2020 10:44:53 +0000 Message-Id: <20201028104606.3504127-134-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' has been queued to stable release 19.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 stable release 19.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 10/30/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 2f766df7721e1cc8e7e2b00a8ea9b4b343ed57fb Mon Sep 17 00:00:00 2001 From: Sachin Saxena Date: Thu, 8 Oct 2020 08:43:57 +0530 Subject: [PATCH] doc: fix diagram in dpaa2 guide [ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ] The diagram to show dpaa2 drivers brief was missing in dpaa2.html file. fix a typo in encoding for a literal block to make it visible in generated doc file. Fixes: 846a8305f277 ("doc: add DPAA2 NIC details") Signed-off-by: Sachin Saxena --- doc/guides/nics/dpaa2.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5a..e54a5ff4d2 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -1,5 +1,5 @@ .. SPDX-License-Identifier: BSD-3-Clause - Copyright 2016 NXP + Copyright 2016,2020 NXP DPAA2 Poll Mode Driver @@ -300,7 +300,7 @@ The diagram below shows the dpaa2 drivers involved in a networking scenario and the objects bound to each driver. A brief description of each driver follows. -.. code-block: console +.. code-block:: console +------------+ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.904887995 +0000 +++ 0134-doc-fix-diagram-in-dpaa2-guide.patch 2020-10-28 10:35:11.704832968 +0000 @@ -1,8 +1,10 @@ -From 1736219b3c5737c943620c22121b361e35b18d0d Mon Sep 17 00:00:00 2001 +From 2f766df7721e1cc8e7e2b00a8ea9b4b343ed57fb Mon Sep 17 00:00:00 2001 From: Sachin Saxena Date: Thu, 8 Oct 2020 08:43:57 +0530 Subject: [PATCH] doc: fix diagram in dpaa2 guide +[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ] + The diagram to show dpaa2 drivers brief was missing in dpaa2.html file. @@ -10,7 +12,6 @@ to make it visible in generated doc file. Fixes: 846a8305f277 ("doc: add DPAA2 NIC details") -Cc: stable@dpdk.org Signed-off-by: Sachin Saxena --- @@ -18,7 +19,7 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst -index d656b7f7a5..ca6ba5b5e2 100644 +index fdfa6fdd5a..e54a5ff4d2 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -1,5 +1,5 @@