From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex@shazbot•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail•com>,
David Matlack <dmatlack@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree
Date: Mon, 1 Dec 2025 10:31:54 +1100 [thread overview]
Message-ID: <20251201103154.32226085@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2025-11-30 23:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-30 23:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-30 23:15 linux-next: manual merge of the vfio tree with the mm-nonmm-stable tree Stephen Rothwell
2025-11-30 23:13 Stephen Rothwell
2025-11-30 23:10 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251201103154.32226085@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alex@shazbot$(echo .)org \
--cc=dmatlack@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=reddybalavignesh9979@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox