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 A96CCA04B1 for ; Thu, 5 Nov 2020 13:42:19 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A3C9F2BFF; Thu, 5 Nov 2020 13:42:18 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 1AD45C806 for ; Thu, 5 Nov 2020 13:42:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580134; 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=N50vSSvLAwoCFIhVpr7rNu+MFfqmikaifRjA9jcZL1Q=; b=QQOtaW724/5g1EeUqzcFERU8Jt3nyGCrVl9zT1MZQhvg2qyzq+7IcGydgGYqsd24eaGCFt ppPq9itjKlujKOZRqbDZJNZJNg4FxNpwmgFbHKDte/XR+zzznba4aU+GpXfPN1dpf3qurX xjyBNXxPssncVMDjtlDd8XSS2n2KPGo= 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-338-z6QWAD34ObeitMcuFaS0hQ-1; Thu, 05 Nov 2020 07:42:12 -0500 X-MC-Unique: z6QWAD34ObeitMcuFaS0hQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 35F011007464; Thu, 5 Nov 2020 12:42:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C4D35C5DE; Thu, 5 Nov 2020 12:42:10 +0000 (UTC) From: Kevin Traynor To: Sachin Saxena Cc: dpdk stable Date: Thu, 5 Nov 2020 12:40:04 +0000 Message-Id: <20201105124015.306404-57-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'doc: fix diagram in dpaa2 guide' has been queued to LTS release 18.11.11 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.11 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/10/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. 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/cbc5a413261c200a190a66763e446ff936647c6b Thanks. Kevin. --- >From cbc5a413261c200a190a66763e446ff936647c6b 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 04370e4cd5..78a8ae589b 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -1,4 +1,4 @@ .. SPDX-License-Identifier: BSD-3-Clause - Copyright 2016 NXP + Copyright 2016,2020 NXP @@ -301,5 +301,5 @@ scenario and the objects bound to each driver. A brief description of each driver follows. -.. code-block: console +.. code-block:: console -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.458371149 +0000 +++ 0057-doc-fix-diagram-in-dpaa2-guide.patch 2020-11-05 12:38:54.256896032 +0000 @@ -1 +1 @@ -From 1736219b3c5737c943620c22121b361e35b18d0d Mon Sep 17 00:00:00 2001 +From cbc5a413261c200a190a66763e446ff936647c6b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1736219b3c5737c943620c22121b361e35b18d0d ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index d656b7f7a5..ca6ba5b5e2 100644 +index 04370e4cd5..78a8ae589b 100644