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: <20251201101046.009b0919@canb.auug.org.au>
Date: Mon, 1 Dec 2025 10:10:46 +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/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"
  

Content of type "application/pgp-signature" skipped