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 19ABBA0613 for ; Wed, 28 Aug 2019 15:43:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CA571C236; Wed, 28 Aug 2019 15:43:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8828C1BF82 for ; Wed, 28 Aug 2019 15:43:01 +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 08630C053FDF; Wed, 28 Aug 2019 13:43:01 +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 C80EE45D5; Wed, 28 Aug 2019 13:42:59 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , dpdk stable Date: Wed, 28 Aug 2019 14:41:50 +0100 Message-Id: <20190828134234.20547-14-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.32]); Wed, 28 Aug 2019 13:43:01 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ring: 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/293cd198d673b6a7b0e337b232f6ef08cfe33a3e Thanks. Kevin Traynor --- >From 293cd198d673b6a7b0e337b232f6ef08cfe33a3e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 11 Jul 2019 13:03:06 -0700 Subject: [PATCH] net/ring: remove redundant declaration [ upstream commit d10b972e25708aecbbca639abded877561b267d2 ] The rte_vdev_driver is declared twice. The first one is not necessary. Fixes: 740feaf349b1 ("ethdev: remove driver name from device private data") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- drivers/net/ring/rte_eth_ring.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c index c438da51c..452114d0c 100644 --- a/drivers/net/ring/rte_eth_ring.c +++ b/drivers/net/ring/rte_eth_ring.c @@ -250,6 +250,4 @@ static const struct eth_dev_ops ops = { }; -static struct rte_vdev_driver pmd_ring_drv; - static int do_eth_dev_ring_create(const char *name, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-28 14:32:32.627790070 +0100 +++ 0015-net-ring-remove-redundant-declaration.patch 2019-08-28 14:32:31.623957761 +0100 @@ -1 +1 @@ -From d10b972e25708aecbbca639abded877561b267d2 Mon Sep 17 00:00:00 2001 +From 293cd198d673b6a7b0e337b232f6ef08cfe33a3e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d10b972e25708aecbbca639abded877561b267d2 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 65c2813ba..eb347bce6 100644 +index c438da51c..452114d0c 100644 @@ -22 +23 @@ -@@ -249,6 +249,4 @@ static const struct eth_dev_ops ops = { +@@ -250,6 +250,4 @@ static const struct eth_dev_ops ops = {