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 D3A70A04A3 for ; Fri, 5 Jun 2020 20:28:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9EE51D5D8; Fri, 5 Jun 2020 20:28:11 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 2BF8E1D5CE for ; Fri, 5 Jun 2020 20:28:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381689; 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=wm2TjbfIcmdjGT+E7UFlfPnx9rxChGNKD6LW3cRA8Nk=; b=gUYnkjPuUWLDM9im5sCAU7xS6pHFXGp9XbZHoCsgN/G45Ci3dg8HGrdd0wybG3akoXSIs/ 4Ntc10tTUIrW2L0Z66iSrUr7cr3Y42x/AUJyy2x1lW4L+cNtHwSgxvO+QYDy4McJl+T7bJ QoQDT9zFajqSvXTJYcCgR8YLnAB7puo= 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-332-8BmrKnO8Ncu25IUv7bpuzw-1; Fri, 05 Jun 2020 14:28:06 -0400 X-MC-Unique: 8BmrKnO8Ncu25IUv7bpuzw-1 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 AD753107ACF2; Fri, 5 Jun 2020 18:28:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0110860C47; Fri, 5 Jun 2020 18:28:04 +0000 (UTC) From: Kevin Traynor To: Muhammad Bilal Cc: dpdk stable Date: Fri, 5 Jun 2020 19:25:24 +0100 Message-Id: <20200605182525.22483-87-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix typo in contributors guide' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/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/a28f45c97ec412e02588cc5efd909cdde58f4018 Thanks. Kevin. --- >From a28f45c97ec412e02588cc5efd909cdde58f4018 Mon Sep 17 00:00:00 2001 From: Muhammad Bilal Date: Thu, 26 Mar 2020 10:46:54 +0500 Subject: [PATCH] doc: fix typo in contributors guide [ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ] Bugzilla ID: 422 Fixes: 9e0e4a00df77 ("doc: suggest to keep doc and code in same patch") Signed-off-by: Muhammad Bilal --- doc/guides/contributing/patches.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 4d8ec47619..a1bfae1c93 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -175,5 +175,5 @@ applied without dependencies as a backport. It is better to keep the related documentation changes in the same patch -file as the code, rather than one big documentation patch at then end of a +file as the code, rather than one big documentation patch at the end of a patchset. This makes it easier for future maintenance and development of the code. -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:55.539125956 +0100 +++ 0087-doc-fix-typo-in-contributors-guide.patch 2020-06-05 19:20:50.992036678 +0100 @@ -1 +1 @@ -From ba8af67fcd7aea9f0d4956bc58b15c71d3319744 Mon Sep 17 00:00:00 2001 +From a28f45c97ec412e02588cc5efd909cdde58f4018 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ba8af67fcd7aea9f0d4956bc58b15c71d3319744 ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ -index 5e6faa0c63..01e0a2f6ba 100644 +index 4d8ec47619..a1bfae1c93 100644 @@ -19 +20 @@ -@@ -183,5 +183,5 @@ applied without dependencies as a backport. +@@ -175,5 +175,5 @@ applied without dependencies as a backport.