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 EA155A04F0 for ; Tue, 10 Dec 2019 16:00:30 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DE2211BE82; Tue, 10 Dec 2019 16:00:30 +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 ED35E1B9B5 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=1575990028; 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=S4oh8UJmoxZIgHQPgwBt9m2K5eVH2NmdoSbpP7VKE1g=; b=S+cH0RT/w+Q91g+yjAxMn+lzFIZGa8PxNVFqA01poZttjb0s3f980aaUa0wtCeQyAlCQ+9 SBNXQwJD1PsJyXBMEFJ/99JRWsD7D9m70u+7tx9oTVokZgpcdIqCXqmknyiPgEKN0IvvBj rkSKPta/cQiSdMfx+XS3UA3/Za9/jp0= 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-320-Riov4FQbPZiLpg8HU6b6vg-1; Tue, 10 Dec 2019 10:00:24 -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 0FCAE10CE78A; Tue, 10 Dec 2019 15:00:23 +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 030285D9C5; Tue, 10 Dec 2019 15:00:21 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Sachin Saxena , dpdk stable Date: Tue, 10 Dec 2019 14:58:48 +0000 Message-Id: <20191210145937.32755-14-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: Riov4FQbPZiLpg8HU6b6vg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'bus/fslmc: 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/0616dbe473eba350c0= 0fda7187cbc57a985eeb84 Thanks. Kevin. --- >From 0616dbe473eba350c00fda7187cbc57a985eeb84 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 5 Sep 2019 15:53:06 +0100 Subject: [PATCH] bus/fslmc: fix global variable multiple definitions [ upstream commit dc111b5e068172c48f9a19987700cc44cadb6d6b ] 'qman_version' 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: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5= .0") Signed-off-by: Ferruh Yigit Acked-by: Sachin Saxena --- drivers/bus/fslmc/qbman/qbman_portal.c | 2 ++ drivers/bus/fslmc/qbman/qbman_portal.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbm= an/qbman_portal.c index bbea37efc..a954307bb 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -62,4 +62,6 @@ enum qbman_sdqcr_fc { static struct qbman_swp *portal_idx_map[MAX_QBMAN_PORTALS]; =20 +uint32_t qman_version; + /* Internal Function declaration */ static int diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h b/drivers/bus/fslmc/qbm= an/qbman_portal.h index 3b0fc540b..628da3ef8 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.h +++ b/drivers/bus/fslmc/qbman/qbman_portal.h @@ -12,5 +12,5 @@ #include =20 -uint32_t qman_version; +extern uint32_t qman_version; #define QMAN_REV_4000 0x04000000 #define QMAN_REV_4100 0x04010000 --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:40.029762999 +0000 +++ 0014-bus-fslmc-fix-global-variable-multiple-definitions.patch=092019-12= -10 14:49:39.001458719 +0000 @@ -1 +1 @@ -From dc111b5e068172c48f9a19987700cc44cadb6d6b Mon Sep 17 00:00:00 2001 +From 0616dbe473eba350c00fda7187cbc57a985eeb84 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dc111b5e068172c48f9a19987700cc44cadb6d6b ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index e6066ce35..12a718117 100644 +index bbea37efc..a954307bb 100644 @@ -34 +35 @@ -index e54f2661c..0e9de8a1b 100644 +index 3b0fc540b..628da3ef8 100644