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 14A2DA04F0 for ; Tue, 10 Dec 2019 16:01:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 094F21B9B7; Tue, 10 Dec 2019 16:01:26 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 1B2271B13C for ; Tue, 10 Dec 2019 16:01:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990083; 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=wplflgJ3OxGHQQqRki7/2Bb14QVSSBzj0TxfHkmj0m4=; b=PZV1KMU4LxNDhqWdvoGe1vZ6bfaGhEgavnZWXRdn4AKxL/uYb4VEYTj7grFMPWM28Gb28z cql34cMWn+sJol7o4YsuE+Qe7r5BtbKDfQS5jbhbk+X869BD7+MD+NNweOcS5z2yamvLJ1 vVPoN1PB8BBFfm9TXCVYv66x5F9nX7o= 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-222-3DmLniGVPA2-sbYXdTJukQ-1; Tue, 10 Dec 2019 10:01:22 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D88E10CE7A0; Tue, 10 Dec 2019 15:01:21 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FEA45DA2C; Tue, 10 Dec 2019 15:01:19 +0000 (UTC) From: Kevin Traynor To: Andrzej Ostruszka Cc: Neil Horman , dpdk stable Date: Tue, 10 Dec 2019 14:59:23 +0000 Message-Id: <20191210145937.32755-49-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: 3DmLniGVPA2-sbYXdTJukQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'doc: fix description of versioning macros' has been queued to LTS release 18.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 LTS release 18.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 12/16/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 rebasi= ng (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/65ccd7c1cb03143bf0= 19b6dcfc5ba2184d02a9a6 Thanks. Kevin. --- >From 65ccd7c1cb03143bf019b6dcfc5ba2184d02a9a6 Mon Sep 17 00:00:00 2001 From: Andrzej Ostruszka Date: Thu, 7 Nov 2019 16:03:07 +0100 Subject: [PATCH] doc: fix description of versioning macros [ upstream commit 519e6548f7a679d769182866a71df98f6b6a85d8 ] This patch fixes documentation of versioning macros so that they are aligned with their implementation (no underscore is added by macros). Fixes: f1ef9794f9bd ("doc: add ABI guidelines") Signed-off-by: Andrzej Ostruszka Acked-by: Neil Horman --- doc/guides/contributing/versioning.rst | 4 ++-- lib/librte_compat/rte_compat.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributi= ng/versioning.rst index fe17c7f13..32618fc83 100644 --- a/doc/guides/contributing/versioning.rst +++ b/doc/guides/contributing/versioning.rst @@ -177,9 +177,9 @@ The macros exported are: =20 * ``VERSION_SYMBOL(b, e, n)``: Creates a symbol version table entry bindin= g - versioned symbol ``b@DPDK_n`` to the internal function ``b_e``. + versioned symbol ``b@DPDK_n`` to the internal function ``be``. =20 * ``BIND_DEFAULT_SYMBOL(b, e, n)``: Creates a symbol version entry instruc= ting the linker to bind references to symbol ``b`` to the internal symbol - ``b_e``. + ``be``. =20 * ``MAP_STATIC_SYMBOL(f, p)``: Declare the prototype ``f``, and map it to = the diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.= h index 92ff28faf..c5a454f4c 100644 --- a/lib/librte_compat/rte_compat.h +++ b/lib/librte_compat/rte_compat.h @@ -39,5 +39,5 @@ * VERSION_SYMBOL * Creates a symbol version table entry binding symbol @DPDK_ to the= internal - * function name _ + * function name */ #define VERSION_SYMBOL(b, e, n) __asm__(".symver " RTE_STR(b) RTE_STR(e) "= , " RTE_STR(b) "@DPDK_" RTE_STR(n)) @@ -46,5 +46,5 @@ * BIND_DEFAULT_SYMBOL * Creates a symbol version entry instructing the linker to bind reference= s to - * symbol to the internal symbol _ + * symbol to the internal symbol */ #define BIND_DEFAULT_SYMBOL(b, e, n) __asm__(".symver " RTE_STR(b) RTE_STR= (e) ", " RTE_STR(b) "@@DPDK_" RTE_STR(n)) --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:42.336545538 +0000 +++ 0049-doc-fix-description-of-versioning-macros.patch=092019-12-10 14:49:= 39.081457227 +0000 @@ -1 +1 @@ -From 519e6548f7a679d769182866a71df98f6b6a85d8 Mon Sep 17 00:00:00 2001 +From 65ccd7c1cb03143bf019b6dcfc5ba2184d02a9a6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 519e6548f7a679d769182866a71df98f6b6a85d8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,2 +16,2 @@ - doc/guides/contributing/versioning.rst | 4 ++-- - lib/librte_eal/common/include/rte_function_versioning.h | 4 ++-- + doc/guides/contributing/versioning.rst | 4 ++-- + lib/librte_compat/rte_compat.h | 4 ++-- @@ -20 +21 @@ -index 64984c54e..8a38928c0 100644 +index fe17c7f13..32618fc83 100644 @@ -23 +24 @@ -@@ -216,9 +216,9 @@ The macros exported are: +@@ -177,9 +177,9 @@ The macros exported are: @@ -35,5 +36,5 @@ -diff --git a/lib/librte_eal/common/include/rte_function_versioning.h b/lib= /librte_eal/common/include/rte_function_versioning.h -index 55e88ffae..eae619d60 100644 ---- a/lib/librte_eal/common/include/rte_function_versioning.h -+++ b/lib/librte_eal/common/include/rte_function_versioning.h -@@ -43,5 +43,5 @@ +diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat= .h +index 92ff28faf..c5a454f4c 100644 +--- a/lib/librte_compat/rte_compat.h ++++ b/lib/librte_compat/rte_compat.h +@@ -39,5 +39,5 @@ @@ -46 +47 @@ -@@ -50,5 +50,5 @@ +@@ -46,5 +46,5 @@