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 9AF2AA04A3 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 9275A1D515; Fri, 5 Jun 2020 20:28:11 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id C77041D5CE for ; Fri, 5 Jun 2020 20:28:09 +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=ZO8uSvDCjkofK4SDkETW1wppYxHsTHZOTIJHuGoudXc=; b=gecGTYKfpNoudGQZA6pG/IgZmb/P9BYdrWzOJJCh0wRiK8tM+C4RERXMWaXCXvzQeUtAVP keZBakgOERWe9AgHq6kNHAIiONURjateqogGyyB/QZwyEh/3VWmchmBVJ7zWW+U85CEzcV zEkfx32EnDDuSGKFcdw59EoTuE+o+dc= 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-473-KXMHV4yRP4-D8VYbpFqRlA-1; Fri, 05 Jun 2020 14:28:05 -0400 X-MC-Unique: KXMHV4yRP4-D8VYbpFqRlA-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 A4468464; Fri, 5 Jun 2020 18:28:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1C8660E1C; Fri, 5 Jun 2020 18:28:03 +0000 (UTC) From: Kevin Traynor To: Sarosh Arif Cc: John McNamara , dpdk stable Date: Fri, 5 Jun 2020 19:25:23 +0100 Message-Id: <20200605182525.22483-86-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/9b5e5ace1a45fe6367332cb564c456b03ca5b151 Thanks. Kevin. --- >From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001 From: Sarosh Arif Date: Sat, 21 Mar 2020 23:06:54 +0500 Subject: [PATCH] doc: fix typo in contributors guide [ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ] Bugzilla ID: 420 Fixes: 58abf6e77c6b ("doc: add contributors guide") Signed-off-by: Sarosh Arif Acked-by: John McNamara --- 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 02cd0555a4..4d8ec47619 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -407,5 +407,5 @@ files, in order of preference:: /etc/dpdk/devel.config. -Once the environment variable the script can be run as follows:: +Once the environment variable is set, the script can be run as follows:: devtools/checkpatches.sh ~/patch/ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:55.483475896 +0100 +++ 0086-doc-fix-typo-in-contributors-guide.patch 2020-06-05 19:20:50.991036701 +0100 @@ -1 +1 @@ -From e37348d7a6c8cb36524910f029e9b1fa855845aa Mon Sep 17 00:00:00 2001 +From 9b5e5ace1a45fe6367332cb564c456b03ca5b151 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e37348d7a6c8cb36524910f029e9b1fa855845aa ] + @@ -8 +9,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index e6a934846e..5e6faa0c63 100644 +index 02cd0555a4..4d8ec47619 100644 @@ -20 +21 @@ -@@ -424,5 +424,5 @@ are loaded from the following files, in order of preference:: +@@ -407,5 +407,5 @@ files, in order of preference::