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 CA2ADA04F0 for ; Tue, 10 Dec 2019 16:00:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C14681B13C; Tue, 10 Dec 2019 16:00:29 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 5A8181B9B5 for ; Tue, 10 Dec 2019 16:00:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990027; 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=2tUbXzP7nlRxq8xAkEHn3GwtI2C8koZNl712bjSZs80=; b=Z9H2FhX/5iL82nIqC4SpgN7JRzYLT7QL0MeKz/SXOdKvK+MszimGTaKLM/+Zf0Lx55wg3f e9EtlZ9IKi9v2hVhgQDg5xwrB9m4BwEFXmds/eFuMccJBEPE7rCguI4JulA+h2F+vDQqCg aJt7sL4JS/oad3Ff3gmITShpsnpy6iw= 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-135-uWX3noNZNvS7QWwxKMDePQ-1; Tue, 10 Dec 2019 10:00:26 -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 5F75110054E3; Tue, 10 Dec 2019 15:00:25 +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 A1A585D9C5; Tue, 10 Dec 2019 15:00:24 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: dpdk stable Date: Tue, 10 Dec 2019 14:58:50 +0000 Message-Id: <20191210145937.32755-16-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: uWX3noNZNvS7QWwxKMDePQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'crypto/null: fix global variable multiple definitions' 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/4e74b260f890dc2070= c093ef5f991e9985fadc55 Thanks. Kevin. --- >From 4e74b260f890dc2070c093ef5f991e9985fadc55 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:08 +0100 Subject: [PATCH] crypto/null: fix global variable multiple definitions [ upstream commit 2ce24ee7acccd68f3a8e736b67808c33f4902a46 ] 'null_logtype_driver' global variable is defined in a header file which was causing multiple definitions of the variable, fixed it by moving it to the .c file. Issue has been detected by '-fno-common' gcc flag. Fixes: 735b783d8c2b ("crypto/null: add dynamic logging") Signed-off-by: Ferruh Yigit --- drivers/crypto/null/null_crypto_pmd.c | 1 + drivers/crypto/null/null_crypto_pmd_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/nu= ll_crypto_pmd.c index 6e29a21a6..1af5da674 100644 --- a/drivers/crypto/null/null_crypto_pmd.c +++ b/drivers/crypto/null/null_crypto_pmd.c @@ -11,4 +11,5 @@ =20 static uint8_t cryptodev_driver_id; +int null_logtype_driver; =20 /** verify and set session parameters */ diff --git a/drivers/crypto/null/null_crypto_pmd_private.h b/drivers/crypto= /null/null_crypto_pmd_private.h index d5905afd8..ae34ce667 100644 --- a/drivers/crypto/null/null_crypto_pmd_private.h +++ b/drivers/crypto/null/null_crypto_pmd_private.h @@ -9,5 +9,5 @@ /**< Null crypto PMD device name */ =20 -int null_logtype_driver; +extern int null_logtype_driver; =20 #define NULL_LOG(level, fmt, ...) \ --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.167616835 +0000 +++ 0016-crypto-null-fix-global-variable-multiple-definitions.patch=092019-= 12-10 14:49:39.005458644 +0000 @@ -1 +1 @@ -From 2ce24ee7acccd68f3a8e736b67808c33f4902a46 Mon Sep 17 00:00:00 2001 +From 4e74b260f890dc2070c093ef5f991e9985fadc55 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2ce24ee7acccd68f3a8e736b67808c33f4902a46 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index d5e3064f2..f11636c5f 100644 +index 6e29a21a6..1af5da674 100644 @@ -32 +33 @@ -index d7bfd9cc8..89c4345b6 100644 +index d5905afd8..ae34ce667 100644