patch 'vfio: fix include with musl runtime' has been queued to stable release 21.11.5

Kevin Traynor ktraynor at redhat.com
Thu Jul 20 17:17:16 CEST 2023


Hi,

FYI, your patch has been queued to stable release 21.11.5

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

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

Thanks.

Kevin

---
>From ae3de8c27c5ac11db88eaadae09e4d6d254289cb Mon Sep 17 00:00:00 2001
From: Philip Prindeville <philipp at redfish-solutions.com>
Date: Sat, 20 May 2023 12:07:30 -0600
Subject: [PATCH] vfio: fix include with musl runtime

[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ]

pread64() and pwrite64() are declared in <unistd.h> in MUSL and
other (i.e. not glibc) C runtimes.

Signed-off-by: Philip Prindeville <philipp at redfish-solutions.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 .mailmap                         | 1 +
 drivers/bus/pci/linux/pci_vfio.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index c1b73055da..c94dacfdb1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1051,4 +1051,5 @@ Petr Houska <t-pehous at microsoft.com>
 Phanendra Vukkisala <pvukkisala at marvell.com>
 Phil Yang <phil.yang at arm.com>
+Philip Prindeville <philipp at redfish-solutions.com>
 Pierre Pfister <ppfister at cisco.com>
 Piotr Azarewicz <piotr.azarewicz at intel.com> <piotrx.t.azarewicz at intel.com>
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index cd0d0b1670..822aa41f9e 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -3,4 +3,5 @@
  */
 
+#include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-07-20 16:17:55.818025940 +0100
+++ 0005-vfio-fix-include-with-musl-runtime.patch	2023-07-20 16:17:54.427749552 +0100
@@ -1 +1 @@
-From c41a103c961ded5a0966652f4daf0a661a947352 Mon Sep 17 00:00:00 2001
+From ae3de8c27c5ac11db88eaadae09e4d6d254289cb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c41a103c961ded5a0966652f4daf0a661a947352 ]
+
@@ -9,2 +10,0 @@
-Cc: stable at dpdk.org
-
@@ -19 +19 @@
-index 0443e461a9..db85cc66c6 100644
+index c1b73055da..c94dacfdb1 100644
@@ -22 +22 @@
-@@ -1059,4 +1059,5 @@ Petr Houska <t-pehous at microsoft.com>
+@@ -1051,4 +1051,5 @@ Petr Houska <t-pehous at microsoft.com>
@@ -29 +29 @@
-index fab3483d9f..fe83e1a04e 100644
+index cd0d0b1670..822aa41f9e 100644



More information about the stable mailing list