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 0495BA2E1B for ; Thu, 5 Sep 2019 12:18:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F0E2F1EF7A; Thu, 5 Sep 2019 12:18:57 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id A82801EF68 for ; Thu, 5 Sep 2019 12:18:55 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 234DA8830A; Thu, 5 Sep 2019 10:18:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FBF719C6A; Thu, 5 Sep 2019 10:18:51 +0000 (UTC) From: Kevin Traynor To: Jerin Jacob Cc: Maxime Coquelin , dpdk stable Date: Thu, 5 Sep 2019 11:17:24 +0100 Message-Id: <20190905101754.21933-24-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 05 Sep 2019 10:18:55 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix build' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/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. 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/018688e92e03b44335f038cb2fef962729ea5721 Thanks. Kevin Traynor --- >From 018688e92e03b44335f038cb2fef962729ea5721 Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Tue, 30 Jul 2019 16:34:06 +0530 Subject: [PATCH] net/virtio: fix build [ upstream commit 198cce71104370de0be3085d3772b502e2aa4984 ] Add extern to variable declaration to avoid some compiler treating it as variable definition. build error log: lib/librte_pmd_virtio.a(vhost_kernel.o):(.rodata+0x110): multiple definition of `vhost_msg_strings' lib/librte_pmd_virtio.a(vhost_user.o):(.data.rel.ro.local+0x0): first defined here lib/librte_pmd_virtio.a(virtio_user_dev.o):(.rodata+0xe8): multiple definition of `vhost_msg_strings' lib/librte_pmd_virtio.a(vhost_user.o):(.data.rel.ro.local+0x0): first defined here Fixes: 33d24d65fe2b ("net/virtio-user: abstract backend operations") Signed-off-by: Jerin Jacob Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 55f47036b..1e784e58e 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -68,5 +68,5 @@ enum vhost_user_request { }; -const char * const vhost_msg_strings[VHOST_USER_MAX]; +extern const char * const vhost_msg_strings[VHOST_USER_MAX]; struct vhost_memory_region { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:48.986133594 +0100 +++ 0024-net-virtio-fix-build.patch 2019-09-05 10:36:47.519700307 +0100 @@ -1 +1 @@ -From 198cce71104370de0be3085d3772b502e2aa4984 Mon Sep 17 00:00:00 2001 +From 018688e92e03b44335f038cb2fef962729ea5721 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 198cce71104370de0be3085d3772b502e2aa4984 ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org