From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Williamson <alex@shazbot•org>,
Marek Szyprowski <m.szyprowski@samsung•com>
Cc: Leon Romanovsky <leon@kernel•org>,
Leon Romanovsky <leonro@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Pranjal Shrivastava <praan@google•com>
Subject: linux-next: manual merge of the vfio tree with the dma-mapping-fixes tree
Date: Thu, 27 Nov 2025 12:13:42 +1100 [thread overview]
Message-ID: <20251127121342.73a2fa9f@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2025-11-27 1:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20251127121342.73a2fa9f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alex@shazbot$(echo .)org \
--cc=leon@kernel$(echo .)org \
--cc=leonro@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.szyprowski@samsung$(echo .)com \
--cc=praan@google$(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