From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 840981B53B for ; Thu, 7 Feb 2019 14:28:23 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAA89A1F65; Thu, 7 Feb 2019 13:28:22 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.33.36.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEF9C600C4; Thu, 7 Feb 2019 13:28:21 +0000 (UTC) From: Kevin Traynor To: Alejandro Lucero Cc: Anatoly Burakov , dpdk stable Date: Thu, 7 Feb 2019 13:25:55 +0000 Message-Id: <20190207132614.20538-49-ktraynor@redhat.com> In-Reply-To: <20190207132614.20538-1-ktraynor@redhat.com> References: <20190207132614.20538-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 07 Feb 2019 13:28:22 +0000 (UTC) Subject: [dpdk-stable] patch 'vfio: fix error message' has been queued to LTS release 18.11.1 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: , X-List-Received-Date: Thu, 07 Feb 2019 13:28:23 -0000 Hi, FYI, your patch has been queued to LTS release 18.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/14/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. Thanks. Kevin Traynor --- >>From 0ac3863560dd3a7f6fb82e33e4f3f585402bad63 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Wed, 23 Jan 2019 10:00:48 +0000 Subject: [PATCH] vfio: fix error message [ upstream commit 43f2b3d250551b66ca282e6c5135b299b22d9d22 ] The message refers to uio driver. Fixes: ff0b67d1c868 ("vfio: DMA mapping") Signed-off-by: Alejandro Lucero Acked-by: Anatoly Burakov --- drivers/bus/pci/linux/pci_vfio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c index 54a4c959e..8e3d43e9c 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -659,5 +659,5 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) if (vfio_res == NULL) { RTE_LOG(ERR, EAL, - "%s(): cannot store uio mmap details\n", __func__); + "%s(): cannot store vfio mmap details\n", __func__); goto err_vfio_dev_fd; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-02-07 13:19:56.712790238 +0000 +++ 0049-vfio-fix-error-message.patch 2019-02-07 13:19:55.000000000 +0000 @@ -1,12 +1,13 @@ -From 43f2b3d250551b66ca282e6c5135b299b22d9d22 Mon Sep 17 00:00:00 2001 +From 0ac3863560dd3a7f6fb82e33e4f3f585402bad63 Mon Sep 17 00:00:00 2001 From: Alejandro Lucero Date: Wed, 23 Jan 2019 10:00:48 +0000 Subject: [PATCH] vfio: fix error message +[ upstream commit 43f2b3d250551b66ca282e6c5135b299b22d9d22 ] + The message refers to uio driver. Fixes: ff0b67d1c868 ("vfio: DMA mapping") -Cc: stable@dpdk.org Signed-off-by: Alejandro Lucero Acked-by: Anatoly Burakov @@ -15,10 +16,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c -index fa8cfbb0b..ebf6ccd3c 100644 +index 54a4c959e..8e3d43e9c 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c -@@ -676,5 +676,5 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) +@@ -659,5 +659,5 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) if (vfio_res == NULL) { RTE_LOG(ERR, EAL, - "%s(): cannot store uio mmap details\n", __func__);