[dpdk-stable] patch 'net/atlantic: remove double function declaration' has been queued to LTS release 18.11.6

Kevin Traynor ktraynor at redhat.com
Fri Nov 22 15:40:54 CET 2019


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 11/29/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/dba3230859f697c0e2078a2f1ba65b492cd690da

Thanks.

Kevin.

---
>From dba3230859f697c0e2078a2f1ba65b492cd690da Mon Sep 17 00:00:00 2001
From: Ivan Ilchenko <ivan.ilchenko at oktetlabs.ru>
Date: Sun, 1 Sep 2019 15:36:43 +0100
Subject: [PATCH] net/atlantic: remove double function declaration

[ upstream commit 5fdd61136babc3ec4a371ed09372c551da3e79b3 ]

atl_dev_info_get() is declared twice in atl_ethdev.c.
Delete one of these declarations.

Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")

Signed-off-by: Ivan Ilchenko <ivan.ilchenko at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Acked-by: Igor Russkikh <igor.russkikh at aquantia.com>
---
 drivers/net/atlantic/atl_ethdev.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 06d4f2eae..623c7166e 100644
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -44,7 +44,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
 			      size_t fw_size);
 
-static void atl_dev_info_get(struct rte_eth_dev *dev,
-			       struct rte_eth_dev_info *dev_info);
-
 static const uint32_t *atl_dev_supported_ptypes_get(struct rte_eth_dev *dev);
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-11-22 14:36:55.665864988 +0000
+++ 0008-net-atlantic-remove-double-function-declaration.patch	2019-11-22 14:36:55.151150269 +0000
@@ -1 +1 @@
-From 5fdd61136babc3ec4a371ed09372c551da3e79b3 Mon Sep 17 00:00:00 2001
+From dba3230859f697c0e2078a2f1ba65b492cd690da Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5fdd61136babc3ec4a371ed09372c551da3e79b3 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 3c1b349df..4a99699ad 100644
+index 06d4f2eae..623c7166e 100644
@@ -23 +24 @@
-@@ -46,7 +46,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,
+@@ -44,7 +44,4 @@ static int atl_fw_version_get(struct rte_eth_dev *dev, char *fw_version,



More information about the stable mailing list