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 3D01CA0613 for ; Wed, 28 Aug 2019 15:43:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 337AB1BF82; Wed, 28 Aug 2019 15:43:04 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id CC5C71C22D for ; Wed, 28 Aug 2019 15:43:02 +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 4ABF87FDF9; Wed, 28 Aug 2019 13:43:02 +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 62B6345D4; Wed, 28 Aug 2019 13:43:01 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Aug 2019 14:41:51 +0100 Message-Id: <20190828134234.20547-15-ktraynor@redhat.com> In-Reply-To: <20190828134234.20547-1-ktraynor@redhat.com> References: <20190828134234.20547-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.27]); Wed, 28 Aug 2019 13:43:02 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio_user: remove redundant declaration' 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/04/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/5302e07e4b62ba2cc8474898334dd662d9b20fba Thanks. Kevin Traynor --- >From 5302e07e4b62ba2cc8474898334dd662d9b20fba Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Jul 2019 13:03:07 -0700 Subject: [PATCH] net/virtio_user: remove redundant declaration [ upstream commit 939aa0df044d856d36b0eb44231f03dc28ede6aa ] The rte_vdev_driver is declared twice. The first one is not necessary. Fixes: 050fe6e9ff97 ("drivers/net: use ethdev allocation helper for vdev") Signed-off-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- drivers/net/virtio/virtio_user_ethdev.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 5781c0948..63b647dc5 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -397,6 +397,4 @@ get_integer_arg(const char *key __rte_unused, } -static struct rte_vdev_driver virtio_user_driver; - static struct rte_eth_dev * virtio_user_eth_dev_alloc(struct rte_vdev_device *vdev) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.685002706 +0100 +++ 0016-net-virtio_user-remove-redundant-declaration.patch 2019-08-28 14:32:31.624957739 +0100 @@ -1 +1 @@ -From 939aa0df044d856d36b0eb44231f03dc28ede6aa Mon Sep 17 00:00:00 2001 +From 5302e07e4b62ba2cc8474898334dd662d9b20fba Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 939aa0df044d856d36b0eb44231f03dc28ede6aa ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0a57db730..3fc172573 100644 +index 5781c0948..63b647dc5 100644 @@ -22 +23 @@ -@@ -442,6 +442,4 @@ get_integer_arg(const char *key __rte_unused, +@@ -397,6 +397,4 @@ get_integer_arg(const char *key __rte_unused,