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 504FDA04F0 for ; Tue, 10 Dec 2019 16:00:34 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 446111B13C; Tue, 10 Dec 2019 16:00:34 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id BFC8C1BE82 for ; Tue, 10 Dec 2019 16:00:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990032; 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=SS9Snlp2JxwpTHDSobsP+Yl3HFCo8DrNoZH4FxcMfcc=; b=iFyDkhMflDxxcOqOiops4rTiTNpOeM810SzzZqhIJFTdknfl+b6p4iWo2xulqBogQCRf/f xkBI7Wn1MN+EWMd0GZzoR0Eh6P4/z7bG3Mm0CXCQtoGcHwuO6PeRKXcO9qkgq22yf6MNMM 2Zz0kNkt7SpFpAnz9hcEkhRLi+BM++E= 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-74-BhZaFCnoMD-iy6nwIvP3MQ-1; Tue, 10 Dec 2019 10:00:29 -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 B072E8024D1; Tue, 10 Dec 2019 15:00:28 +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 219AE5D9C5; Tue, 10 Dec 2019 15:00:26 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Ashish Gupta , dpdk stable Date: Tue, 10 Dec 2019 14:58:52 +0000 Message-Id: <20191210145937.32755-18-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: BhZaFCnoMD-iy6nwIvP3MQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'compress/octeontx: 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/b72c96fde5bb413bfc= cbaa17335d6964cdf54503 Thanks. Kevin. --- >From b72c96fde5bb413bfccbaa17335d6964cdf54503 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:12 +0100 Subject: [PATCH] compress/octeontx: fix global variable multiple definition= s [ upstream commit 4d6194db01f51169181c0af6e6dc5fed042265ad ] 'octtx_zip_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: 43e610bb8565 ("compress/octeontx: introduce octeontx zip PMD") Signed-off-by: Ferruh Yigit Acked-by: Ashish Gupta --- drivers/compress/octeontx/otx_zip.h | 2 +- drivers/compress/octeontx/otx_zip_pmd.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/compress/octeontx/otx_zip.h b/drivers/compress/octeont= x/otx_zip.h index 3abefd1dc..e43f7f5c3 100644 --- a/drivers/compress/octeontx/otx_zip.h +++ b/drivers/compress/octeontx/otx_zip.h @@ -18,5 +18,5 @@ #include =20 -int octtx_zip_logtype_driver; +extern int octtx_zip_logtype_driver; =20 /* ZIP VF Control/Status registers (CSRs): */ diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/oct= eontx/otx_zip_pmd.c index a1651b22e..9e00c8663 100644 --- a/drivers/compress/octeontx/otx_zip_pmd.c +++ b/drivers/compress/octeontx/otx_zip_pmd.c @@ -12,4 +12,6 @@ #include "otx_zip.h" =20 +int octtx_zip_logtype_driver; + static const struct rte_compressdev_capabilities =09=09=09=09octtx_zip_pmd_capabilities[] =3D { --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.298120901 +0000 +++ 0018-compress-octeontx-fix-global-variable-multiple-defin.patch=092019-= 12-10 14:49:39.007458607 +0000 @@ -1 +1 @@ -From 4d6194db01f51169181c0af6e6dc5fed042265ad Mon Sep 17 00:00:00 2001 +From b72c96fde5bb413bfccbaa17335d6964cdf54503 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4d6194db01f51169181c0af6e6dc5fed042265ad ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org