From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id E321D2BA5 for ; Fri, 8 Mar 2019 18:49:42 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 8 Mar 2019 19:49:41 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x28HloBM002625; Fri, 8 Mar 2019 19:49:39 +0200 From: Yongseok Koh To: Alejandro Lucero Cc: Anatoly Burakov , dpdk stable Date: Fri, 8 Mar 2019 09:47:44 -0800 Message-Id: <20190308174749.30771-66-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190308174749.30771-1-yskoh@mellanox.com> References: <20190308174749.30771-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'vfio: fix error message' has been queued to LTS release 17.11.6 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: Fri, 08 Mar 2019 17:49:43 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objection by 03/13/19. So please shout if anyone has objection. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Yongseok --- >>From e3573a7e4bfed6ca04b72e6a768f3229ae3f85c9 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 654897284..5093265e5 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c @@ -473,7 +473,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) vfio_res = rte_zmalloc("VFIO_RES", sizeof(*vfio_res), 0); 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; } memcpy(&vfio_res->pci_addr, &dev->addr, sizeof(vfio_res->pci_addr)); -- 2.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-03-08 09:46:43.426282324 -0800 +++ 0066-vfio-fix-error-message.patch 2019-03-08 09:46:40.374404000 -0800 @@ -1,12 +1,13 @@ -From 43f2b3d250551b66ca282e6c5135b299b22d9d22 Mon Sep 17 00:00:00 2001 +From e3573a7e4bfed6ca04b72e6a768f3229ae3f85c9 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 654897284..5093265e5 100644 --- a/drivers/bus/pci/linux/pci_vfio.c +++ b/drivers/bus/pci/linux/pci_vfio.c -@@ -675,7 +675,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) +@@ -473,7 +473,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev) vfio_res = rte_zmalloc("VFIO_RES", sizeof(*vfio_res), 0); if (vfio_res == NULL) { RTE_LOG(ERR, EAL,