[dpdk-stable] patch 'bus/pci: fix build with MinGW-w64 8' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/d97da41ef8770b08649119ca6f0caf16e8e50d1d

Thanks.

Luca Boccassi

---
>From d97da41ef8770b08649119ca6f0caf16e8e50d1d Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Date: Tue, 1 Dec 2020 19:39:59 +0300
Subject: [PATCH] bus/pci: fix build with MinGW-w64 8

[ upstream commit de785ba0565ceb5d91d3f397606e5021efd53d84 ]

Fix redefinition of GUID, missing from previous versions.

Fixes: b762221ac24f ("bus/pci: support Windows with bifurcated drivers")

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Tested-by: Thomas Monjalon <thomas at monjalon.net>
---
 drivers/bus/pci/windows/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index b450346bdc..33a5fb1d83 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -11,7 +11,7 @@
 
 #include <devpkey.h>
 
-#ifdef RTE_TOOLCHAIN_GCC
+#if defined RTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR < 8)
 #include <devpropdef.h>
 DEFINE_DEVPROPKEY(DEVPKEY_Device_Numa_Node, 0x540b947e, 0x8b40, 0x45bc,
 	0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 3);
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:29.454167368 +0000
+++ 0002-bus-pci-fix-build-with-MinGW-w64-8.patch	2021-02-05 11:18:28.582686848 +0000
@@ -1 +1 @@
-From de785ba0565ceb5d91d3f397606e5021efd53d84 Mon Sep 17 00:00:00 2001
+From d97da41ef8770b08649119ca6f0caf16e8e50d1d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit de785ba0565ceb5d91d3f397606e5021efd53d84 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org