[dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 10/30/20. 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.

Thanks.

Luca Boccassi

---
>From b4b613b2b4a6a91ae42a78f6993bcf8fd1e6f492 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Thu, 17 Sep 2020 13:28:23 +0200
Subject: [PATCH] bus/pci: remove duplicate declaration

[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ]

This declaration is the same as the one a few lines before.

Fixes: 6844d146ff39 ("eal: add bus pointer in device structure")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/bus/pci/private.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
index af1c7ae5fe..9d14769a7e 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -15,8 +15,6 @@ extern struct rte_pci_bus rte_pci_bus;
 struct rte_pci_driver;
 struct rte_pci_device;
 
-extern struct rte_pci_bus rte_pci_bus;
-
 /**
  * Scan the content of the PCI bus, and the devices in the devices
  * list
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:11.863307471 +0000
+++ 0002-bus-pci-remove-duplicate-declaration.patch	2020-10-28 10:35:11.376828139 +0000
@@ -1,12 +1,13 @@
-From f252fe5e18e060e2b79f193d21d80e2dbbf743be Mon Sep 17 00:00:00 2001
+From b4b613b2b4a6a91ae42a78f6993bcf8fd1e6f492 Mon Sep 17 00:00:00 2001
 From: David Marchand <david.marchand at redhat.com>
 Date: Thu, 17 Sep 2020 13:28:23 +0200
 Subject: [PATCH] bus/pci: remove duplicate declaration
 
+[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ]
+
 This declaration is the same as the one a few lines before.
 
 Fixes: 6844d146ff39 ("eal: add bus pointer in device structure")
-Cc: stable at dpdk.org
 
 Signed-off-by: David Marchand <david.marchand at redhat.com>
 Acked-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -15,7 +16,7 @@
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/bus/pci/private.h b/drivers/bus/pci/private.h
-index fadc767236..16f997c701 100644
+index af1c7ae5fe..9d14769a7e 100644
 --- a/drivers/bus/pci/private.h
 +++ b/drivers/bus/pci/private.h
 @@ -15,8 +15,6 @@ extern struct rte_pci_bus rte_pci_bus;