* linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree
@ 2025-11-30 23:10 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-30 23:10 UTC (permalink / raw)
To: Alex Williamson, Andrew Morton
Cc: Bala-Vignesh-Reddy, David Matlack, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
tools/testing/selftests/vfio/lib/vfio_pci_device.c
between commit:
e6fbd1759c9e ("selftests: complete kselftest include centralization")
from the mm-nonmm-stable tree and commit:
657d241e695f ("vfio: selftests: Rename vfio_util.h to libvfio.h")
from the vfio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/vfio/lib/vfio_pci_device.c
index 4628beb62453,13fdb4b0b10f..000000000000
--- a/tools/testing/selftests/vfio/lib/vfio_pci_device.c
+++ b/tools/testing/selftests/vfio/lib/vfio_pci_device.c
@@@ -19,8 -19,8 +19,8 @@@
#include <linux/types.h>
#include <linux/vfio.h>
-#include "../../../kselftest.h"
+#include "kselftest.h"
- #include <vfio_util.h>
+ #include <libvfio.h>
#define PCI_SYSFS_PATH "/sys/bus/pci/devices"
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree
@ 2025-11-30 23:13 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-30 23:13 UTC (permalink / raw)
To: Alex Williamson, Andrew Morton
Cc: Bala-Vignesh-Reddy, David Matlack, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
tools/testing/selftests/vfio/lib/vfio_pci_driver.c
between commit:
e6fbd1759c9e ("selftests: complete kselftest include centralization")
from the mm-nonmm-stable tree and commits:
6c74d9830d8b ("vfio: selftests: Eliminate overly chatty logging")
657d241e695f ("vfio: selftests: Rename vfio_util.h to libvfio.h")
from the vfio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/vfio/lib/vfio_pci_driver.c
index fb958d895c17,ca0e25efbfa1..000000000000
--- a/tools/testing/selftests/vfio/lib/vfio_pci_driver.c
+++ b/tools/testing/selftests/vfio/lib/vfio_pci_driver.c
@@@ -1,8 -1,6 +1,6 @@@
// SPDX-License-Identifier: GPL-2.0-only
- #include <stdio.h>
-
-#include "../../../kselftest.h"
+#include "kselftest.h"
- #include <vfio_util.h>
+ #include <libvfio.h>
#ifdef __x86_64__
extern struct vfio_pci_driver_ops dsa_ops;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree
@ 2025-11-30 23:15 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-30 23:15 UTC (permalink / raw)
To: Alex Williamson, Andrew Morton
Cc: Bala-Vignesh-Reddy, David Matlack, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
between commit:
e6fbd1759c9e ("selftests: complete kselftest include centralization")
from the mm-nonmm-stable tree and commit:
657d241e695f ("vfio: selftests: Rename vfio_util.h to libvfio.h")
from the vfio tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
index 6854a9dedff3,caf1c6291f3d..000000000000
--- a/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
+++ b/tools/testing/selftests/vfio/vfio_iommufd_setup_test.c
@@@ -10,8 -10,8 +10,8 @@@
#include <sys/ioctl.h>
#include <unistd.h>
- #include <vfio_util.h>
+ #include <libvfio.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const char iommu_dev_path[] = "/dev/iommu";
static const char *cdev_path;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree
@ 2025-11-30 23:31 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2025-11-30 23:31 UTC (permalink / raw)
To: Alex Williamson, Andrew Morton
Cc: Bala-Vignesh-Reddy, David Matlack, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1935 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
tools/testing/selftests/vfio/lib/include/vfio_util.h
between commit:
e6fbd1759c9e ("selftests: complete kselftest include centralization")
from the mm-nonmm-stable tree and commits:
5fabc49abf7a ("vfio: selftests: Split libvfio.h into separate header files")
657d241e695f ("vfio: selftests: Rename vfio_util.h to libvfio.h")
from the vfio tree.
I fixed it up (I deleted the above file and added the following merge
fix patch) and can carry the fix as necessary. This is now fixed as far
as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 1 Dec 2025 10:28:51 +1100
Subject: [PATCH] fix up for "vfio: selftests: Split libvfio.h into separate
header files"
interacting with commit
e6fbd1759c9e ("selftests: complete kselftest include centralization")
from the mm-nonmm-stable tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
tools/testing/selftests/vfio/lib/include/libvfio/assert.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/vfio/lib/include/libvfio/assert.h b/tools/testing/selftests/vfio/lib/include/libvfio/assert.h
index f4ebd122d9b6..986ad26d92a1 100644
--- a/tools/testing/selftests/vfio/lib/include/libvfio/assert.h
+++ b/tools/testing/selftests/vfio/lib/include/libvfio/assert.h
@@ -6,7 +6,7 @@
#include <string.h>
#include <sys/ioctl.h>
-#include "../../../../kselftest.h"
+#include "kselftest.h"
#define VFIO_LOG_AND_EXIT(...) do { \
fprintf(stderr, " " __VA_ARGS__); \
--
2.52.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-11-30 23:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-30 23:31 linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-11-30 23:15 Stephen Rothwell
2025-11-30 23:13 Stephen Rothwell
2025-11-30 23:10 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox