From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E1F8A2E1B for ; Thu, 5 Sep 2019 12:19:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 509D61EF92; Thu, 5 Sep 2019 12:19:13 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 58CB41EF84 for ; Thu, 5 Sep 2019 12:19:12 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB2C8307D915 for ; Thu, 5 Sep 2019 10:19:11 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id F25ED19C77; Thu, 5 Sep 2019 10:19:10 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: dpdk stable Date: Thu, 5 Sep 2019 11:17:34 +0100 Message-Id: <20190905101754.21933-34-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Thu, 05 Sep 2019 10:19:11 +0000 (UTC) Subject: [dpdk-stable] patch 'bus/pci: remove unused x86 Linux constant' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/12/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/41bcafb3b891e8c882d609ca5ef88f6463b6dcd4 Thanks. Kevin Traynor --- >From 41bcafb3b891e8c882d609ca5ef88f6463b6dcd4 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 2 Aug 2019 11:54:01 +0200 Subject: [PATCH] bus/pci: remove unused x86 Linux constant [ upstream commit b62f3aff913daff969bb88cded19f41ed98da772 ] This macro is unused after a previous fix. Fixes: fe822eb8c565 ("bus/pci: use IOVA DMA mask check when setting IOVA mode") Signed-off-by: David Marchand --- drivers/bus/pci/linux/pci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index c99d523f0..74794a3ba 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -584,5 +584,4 @@ pci_one_device_iommu_support_va(struct rte_pci_device *dev) #define VTD_CAP_MGAW_SHIFT 16 #define VTD_CAP_MGAW_MASK (0x3fULL << VTD_CAP_MGAW_SHIFT) -#define X86_VA_WIDTH 47 /* From Documentation/x86/x86_64/mm.txt */ struct rte_pci_addr *addr = &dev->addr; char filename[PATH_MAX]; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:49.581028317 +0100 +++ 0034-bus-pci-remove-unused-x86-Linux-constant.patch 2019-09-05 10:36:47.531700019 +0100 @@ -1 +1 @@ -From b62f3aff913daff969bb88cded19f41ed98da772 Mon Sep 17 00:00:00 2001 +From 41bcafb3b891e8c882d609ca5ef88f6463b6dcd4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b62f3aff913daff969bb88cded19f41ed98da772 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ -index 1d8d20d93..f4fb7427b 100644 +index c99d523f0..74794a3ba 100644 @@ -20 +21 @@ -@@ -504,5 +504,4 @@ pci_one_device_iommu_support_va(const struct rte_pci_device *dev) +@@ -584,5 +584,4 @@ pci_one_device_iommu_support_va(struct rte_pci_device *dev) @@ -24 +25 @@ - const struct rte_pci_addr *addr = &dev->addr; + struct rte_pci_addr *addr = &dev->addr;