* linux-next: manual merge of the vfio tree with the dma-mapping-fixes tree
@ 2025-11-27 1:13 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-11-27 1:13 UTC (permalink / raw)
To: Alex Williamson, Marek Szyprowski
Cc: Leon Romanovsky, Leon Romanovsky, Linux Kernel Mailing List,
Linux Next Mailing List, Pranjal Shrivastava
[-- Attachment #1: Type: text/plain, Size: 1289 bytes --]
Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
kernel/dma/direct.c
between commit:
d0d08f4bd7f6 ("dma-direct: Fix missing sg_dma_len assignment in P2PDMA bus mappings")
from the dma-mapping-fixes tree and commit:
d4504262f745 ("PCI/P2PDMA: Simplify bus address mapping API")
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 kernel/dma/direct.c
index f973e7e73c90,d8b3dfc598b2..000000000000
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@@ -479,9 -479,8 +479,9 @@@ int dma_direct_map_sg(struct device *de
}
break;
case PCI_P2PDMA_MAP_BUS_ADDR:
- sg->dma_address = pci_p2pdma_bus_addr_map(&p2pdma_state,
- sg_phys(sg));
+ sg->dma_address = pci_p2pdma_bus_addr_map(
+ p2pdma_state.mem, sg_phys(sg));
+ sg_dma_len(sg) = sg->length;
sg_dma_mark_bus_address(sg);
continue;
default:
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-27 1:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-27 1:13 linux-next: manual merge of the vfio tree with the dma-mapping-fixes tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox