linux-kernel - linux-next: manual merge of the vfio tree with the mm-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 for Android: free password hash cracker in your pocket

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

Message-ID: <20251201114439.4fab07f6@canb.auug.org.au>
Date: Mon, 1 Dec 2025 11:44:39 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alex Williamson <alex@...zbot.org>, Andrew Morton
 <akpm@...ux-foundation.org>
Cc: Ankit Agrawal <ankita@...dia.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-stable tree

Hi all,

After merging the vfio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/vfio/pci/nvgrace-gpu/main.c: In function 'nvgrace_gpu_mmap':
drivers/vfio/pci/nvgrace-gpu/main.c:344:17: error: 'ret' undeclared (first use in this function); did you mean 'net'?
  344 |                 ret = nvgrace_gpu_vfio_pci_register_pfn_range(&nvdev->resmem, vma);
      |                 ^~~
      |                 net
drivers/vfio/pci/nvgrace-gpu/main.c:344:17: note: each undeclared identifier is reported only once for each function it appears in
drivers/vfio/pci/nvgrace-gpu/main.c:350:1: error: control reaches end of non-void function [-Werror=return-type]
  350 | }
      | ^
cc1: all warnings being treated as errors

Caused by commit

  9db65489b872 ("vfio/nvgrace-gpu: Add support for huge pfnmap")

interacting with commit

  ebb9aeb980e5 ("vfio/nvgrace-gpu: register device memory for poison handling")

from the mm-stable tree.

I have applied the following merge resolution patch.  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 11:10:51 +1100
Subject: [PATCH] fix up for "vfio/nvgrace-gpu: Add support for huge pfnmap"

interacting with commit

  ebb9aeb980e5 ("vfio/nvgrace-gpu: register device memory for poison handling")

from the mm-stable tree.

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 drivers/vfio/pci/nvgrace-gpu/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/vfio/pci/nvgrace-gpu/main.c b/drivers/vfio/pci/nvgrace-gpu/main.c
index 4104f46fb378..c6eddb7b823a 100644
--- a/drivers/vfio/pci/nvgrace-gpu/main.c
+++ b/drivers/vfio/pci/nvgrace-gpu/main.c
@@ -292,6 +292,7 @@ static int nvgrace_gpu_mmap(struct vfio_device *core_vdev,
 	struct mem_region *memregion;
 	u64 req_len, pgoff, end;
 	unsigned int index;
+	int ret = 0;
 
 	index = vma->vm_pgoff >> (VFIO_PCI_OFFSET_SHIFT - PAGE_SHIFT);
 
-- 
2.52.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped