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:13:12 +1100

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;