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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20251201103154.32226085@canb.auug.org.au>
Date: Mon, 1 Dec 2025 10:31:54 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alex Williamson <alex@...zbot.org>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Bala-Vignesh-Reddy <reddybalavignesh9979@...il.com>, David Matlack
 <dmatlack@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfio tree with the mm-nonmm-stable
 tree

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@...b.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@...b.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

Content of type "application/pgp-signature" skipped