Subject: linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 1 Dec 2025 10:31:54 +1100

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 <[email-masked]>
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 <[email-masked]>
---
 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