From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 567EBA05D3 for ; Thu, 25 Apr 2019 17:42:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 48CE6374; Thu, 25 Apr 2019 17:42:09 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id F22B3374 for ; Thu, 25 Apr 2019 17:42:07 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5EDF830BC65D; Thu, 25 Apr 2019 15:42:07 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 492315DE84; Thu, 25 Apr 2019 15:42:06 +0000 (UTC) From: Kevin Traynor To: Rami Rosen Cc: Marko Kovacevic , dpdk stable Date: Thu, 25 Apr 2019 16:40:30 +0100 Message-Id: <20190425154037.28778-55-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 25 Apr 2019 15:42:07 +0000 (UTC) Subject: [dpdk-stable] patch 'doc: fix two typos in contributing guide' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/01/19. 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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001 From: Rami Rosen Date: Fri, 15 Mar 2019 11:19:00 +0200 Subject: [PATCH] doc: fix two typos in contributing guide [ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ] This patch fixes two typos in the coding style part of DPDK contributing guide: - The header entry should have .h file instead of .c file. - The will->This will Fixes: 44a6dface13b ("doc: describe how to add new components") Signed-off-by: Rami Rosen Acked-by: Marko Kovacevic --- doc/guides/contributing/coding_style.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index d96698a73..656563dde 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -826,8 +826,8 @@ format. sources = files('file1.c', ...) - headers = files('file1.c', ...) + headers = files('file1.h', ...) -The will build based on a number of conventions and assumptions within the DPDK +This will build based on a number of conventions and assumptions within the DPDK itself, for example, that the library name is the same as the directory name in which the files are stored. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:49.117484341 +0100 +++ 0055-doc-fix-two-typos-in-contributing-guide.patch 2019-04-25 16:37:46.771294354 +0100 @@ -1 +1 @@ -From eeafaf40c9b05f410991fe8302f2b64ce37af510 Mon Sep 17 00:00:00 2001 +From 490b1e4cd5456d9498b1a60097ebff0def6589dc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eeafaf40c9b05f410991fe8302f2b64ce37af510 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org