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 E2B6CA04F0 for ; Thu, 19 Dec 2019 15:40:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C973E1BFE7; Thu, 19 Dec 2019 15:40:28 +0100 (CET) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by dpdk.org (Postfix) with ESMTP id 0D3A01BFE7 for ; Thu, 19 Dec 2019 15:40:28 +0100 (CET) Received: by mail-wr1-f52.google.com with SMTP id c14so6218257wrn.7 for ; Thu, 19 Dec 2019 06:40:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7lfNaWrkykxC4Mg7BcxCmAGpjeh7sUTztnEikXlpeJU=; b=Kj3djGeL0m/frcy901Ppi/gY1mNtWjdb0G1y8UyRC7en0WjdaxKYEQppFOATTrnBHs tnJim1giz8JDk/HTl3wXZMpr9Cl4fmzgNClBrd1GAvRm06K86ehNC+tYRq5snTYZ+pce zRdIqDDJT5WCu02WuIikD5kxnKlb9oLHy+nzfH2lk5kujxuhO678mQ3mh9btMiP843z6 NaiKdwpq6aZPr2OrVELSaI9anoYORkiydQshKhF0pJmLFeXaJ8oOKUoVSypskN9MHwJg U/dWeTIhXCqN39ohSgHSOxnQkFv3V3sTWnTQfYvV2TnG96rZvhTBc/A2dWpAyWCZQhbr aq5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7lfNaWrkykxC4Mg7BcxCmAGpjeh7sUTztnEikXlpeJU=; b=spTUfgt/cQyrs6j1dNF2pGtscfrPeuzykilVn7kxWwvhZC2QbW7JmeBTphFONbT1ry 9ljtEDKZjsPVmSDCaVoEAYHbEgFG3+gL7enlLdDAoXXCZDy0lxGB9wUxYUAvFSJH05Js mEfRbv+563udjT8GU5f4eHAuI+cIQRMtKFWs69woQ+OdRV9aeMDwqJCpxRr1h7g6QWps MH/GRumnV63iusmh/MnAp9no/kPDjxA2h4nKDdv/rLp3oiKS+qZ2Xlr0cFZAlDZIOFts eGCmMACVThUkNSiutu/pc+cygBZAw0L4Yt4eLVMEn946FbF+nwCv4mpMhZpu9QTxLKqY JfRg== X-Gm-Message-State: APjAAAVBZQIbHIB4kbX8eXrWOGyLHE9qeXsmEe9f0uW1SOgqgbZeI8e/ WALtQWfzhR8+TjVTstdwPSw= X-Google-Smtp-Source: APXvYqxPLhgGOZZF00+A/C69zL8x2hC84bYydj6Q/eojPUnH3eZLL7IXWaXZX+xlJHDk3Er5DZGbMA== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr9529650wrt.208.1576766427564; Thu, 19 Dec 2019 06:40:27 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u16sm6160393wmj.41.2019.12.19.06.40.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:40:27 -0800 (PST) From: luca.boccassi@gmail.com To: Andrzej Ostruszka Cc: Neil Horman , dpdk stable Date: Thu, 19 Dec 2019 14:34:07 +0000 Message-Id: <20191219143447.21506-100-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix description of versioning macros' has been queued to LTS release 17.11.10 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 17.11.10 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/21/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. Thanks. Luca Boccassi --- >From 074a6d6927a4ef58e03bdbeea7e3fdda9a0356a6 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/contributing/versioning.rst index 4000906289..fe15e9afd7 100644 --- a/doc/guides/contributing/versioning.rst +++ b/doc/guides/contributing/versioning.rst @@ -149,11 +149,11 @@ library so that older binaries need not be immediately recompiled. The macros exported are: * ``VERSION_SYMBOL(b, e, n)``: Creates a symbol version table entry binding - versioned symbol ``b@DPDK_n`` to the internal function ``b_e``. + versioned symbol ``b@DPDK_n`` to the internal function ``be``. * ``BIND_DEFAULT_SYMBOL(b, e, n)``: Creates a symbol version entry instructing the linker to bind references to symbol ``b`` to the internal symbol - ``b_e``. + ``be``. * ``MAP_STATIC_SYMBOL(f, p)``: Declare the prototype ``f``, and map it to the fully qualified function ``p``, so that if a symbol becomes versioned, it diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h index 41e8032ba1..f45b434f1b 100644 --- a/lib/librte_compat/rte_compat.h +++ b/lib/librte_compat/rte_compat.h @@ -63,14 +63,14 @@ /* * 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)) /* * BIND_DEFAULT_SYMBOL * Creates a symbol version entry instructing the linker to bind references 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)) #define __vsym __attribute__((used)) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:30.304519073 +0000 +++ 0100-doc-fix-description-of-versioning-macros.patch 2019-12-19 14:32:26.233300364 +0000 @@ -1,26 +1,27 @@ -From 519e6548f7a679d769182866a71df98f6b6a85d8 Mon Sep 17 00:00:00 2001 +From 074a6d6927a4ef58e03bdbeea7e3fdda9a0356a6 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") -Cc: stable@dpdk.org Signed-off-by: Andrzej Ostruszka Acked-by: Neil Horman --- - 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 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst -index 64984c54e6..8a38928c02 100644 +index 4000906289..fe15e9afd7 100644 --- a/doc/guides/contributing/versioning.rst +++ b/doc/guides/contributing/versioning.rst -@@ -215,11 +215,11 @@ library so that older binaries need not be immediately recompiled. +@@ -149,11 +149,11 @@ library so that older binaries need not be immediately recompiled. The macros exported are: * ``VERSION_SYMBOL(b, e, n)``: Creates a symbol version table entry binding @@ -34,11 +35,11 @@ * ``MAP_STATIC_SYMBOL(f, p)``: Declare the prototype ``f``, and map it to the fully qualified function ``p``, so that if a symbol becomes versioned, it -diff --git a/lib/librte_eal/common/include/rte_function_versioning.h b/lib/librte_eal/common/include/rte_function_versioning.h -index 55e88ffae6..eae619d605 100644 ---- a/lib/librte_eal/common/include/rte_function_versioning.h -+++ b/lib/librte_eal/common/include/rte_function_versioning.h -@@ -42,14 +42,14 @@ +diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_compat/rte_compat.h +index 41e8032ba1..f45b434f1b 100644 +--- a/lib/librte_compat/rte_compat.h ++++ b/lib/librte_compat/rte_compat.h +@@ -63,14 +63,14 @@ /* * VERSION_SYMBOL * Creates a symbol version table entry binding symbol @DPDK_ to the internal