From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 34056A0524 for ; Fri, 5 Feb 2021 12:19:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 279241606B6; Fri, 5 Feb 2021 12:19:32 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id B6C714067B for ; Fri, 5 Feb 2021 12:19:30 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id p15so7226254wrq.8 for ; Fri, 05 Feb 2021 03:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zTVyn1xcDERn7AOXGhZdMkeyDE0Aqozr8aA2gsKiH9I=; b=un5Vke49+SFdRgTQEzV49ngWYi7QxeKElBQLEyXq3c2mAYC1wYPTa0fJy0YqIMD1Ze pQuJ6zH9a/HxFW318WSqnrhJAMqskfuF0imDWWmx0spBNZ5RjwzFPfHnvJBnhwQEjDzz aJApluXX/+9Foblws+lkUB9jy3Nr8nnb2UdFJgM9b7CEbKJgjIlfZibJk5wvmonSDLfD 0YkDptQDi91NMFDgfx16TKpL6c2wvsy44tOY5H4RfP6B5jQAhMhHegPOyzS+GffjV9NO KHgXsdDOqqDZuBwS7TDFpAYPU4xPkz/enzryNrpOeQE+ietGLsV6LGxolGqT5H/J/ctg 95kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zTVyn1xcDERn7AOXGhZdMkeyDE0Aqozr8aA2gsKiH9I=; b=t9ED138++oaC2DyI6U5XDfaN1DYjWrt2/loy/n2aCPOYKyNABW3i+ORC4f4g2T7kkr qCZPSXp0XqST7pNNfvnhOkVJGe/m5w2Hy1rl8sQMghzu97cscfIQ1OKucYuLs3EGsI0i q3Pg7qQkRtc++94NqPTtUM0cDNTL0262wsFSmZ3BN5UgvweIQmyVLoKwZJmIPR1vmdWt g+h1MKufyscT8PEpqGTeTCWsGEyaP+EhpIF0HAok4gV7vGfRAIOOTjJCIaVVZR04ZN1l hOTohOcaQrSXU08uQqLQfY7bmWWcvlGjtmsUA3jYjeiHinPMuC4bsL1IdAyrXMMNFto3 gnPA== X-Gm-Message-State: AOAM532jOpM0VhlAmcYalVov12bMCO3i2Lqq+na/McdAp6yuMecelcUc eisZMe4OOM3PoKvU3ossjGA= X-Google-Smtp-Source: ABdhPJxrxIcZxxpyuFWRYkPmtB6Av+w5RvCLzPejguachk7jJfIJ8STkVizBhwA+q4zn4dmsNDtoMQ== X-Received: by 2002:a5d:4046:: with SMTP id w6mr4314850wrp.369.1612523970521; Fri, 05 Feb 2021 03:19:30 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id d10sm11518914wrn.88.2021.02.05.03.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:19:29 -0800 (PST) From: luca.boccassi@gmail.com To: Dmitry Kozlyuk Cc: Thomas Monjalon , dpdk stable Date: Fri, 5 Feb 2021 11:14:48 +0000 Message-Id: <20210205111920.1272063-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'bus/pci: fix build with MinGW-w64 8' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 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 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 Tested-by: Thomas Monjalon --- 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 -#ifdef RTE_TOOLCHAIN_GCC +#if defined RTE_TOOLCHAIN_GCC && (__MINGW64_VERSION_MAJOR < 8) #include 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@dpdk.org