[dpdk-stable] patch 'bus/pci: remove duplicate declaration' has been queued to LTS release 18.11.11
Kevin Traynor
ktraynor at redhat.com
Thu Nov 5 13:39:08 CET 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.11
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/10/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.
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/5f9331ff0e72b4133361436d115477ae0049ebb2
Thanks.
Kevin.
---
>From 5f9331ff0e72b4133361436d115477ae0049ebb2 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 22cefc8b93..9e1baf3efd 100644
--- a/drivers/bus/pci/private.h
+++ b/drivers/bus/pci/private.h
@@ -16,6 +16,4 @@ 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
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-11-05 12:38:54.296310124 +0000
+++ 0001-bus-pci-remove-duplicate-declaration.patch 2020-11-05 12:38:54.132895936 +0000
@@ -1 +1 @@
-From f252fe5e18e060e2b79f193d21d80e2dbbf743be Mon Sep 17 00:00:00 2001
+From 5f9331ff0e72b4133361436d115477ae0049ebb2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f252fe5e18e060e2b79f193d21d80e2dbbf743be ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index fadc767236..16f997c701 100644
+index 22cefc8b93..9e1baf3efd 100644
More information about the stable
mailing list