* linux-next: manual merge of the iommu tree with the dmaengine-fixes tree
@ 2025-05-16 6:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2025-05-16 6:05 UTC (permalink / raw)
To: Joerg Roedel, Vinod Koul
Cc: Joerg Roedel, Linux Kernel Mailing List, Linux Next Mailing List,
Lu Baolu, Shuai Xue
[-- Attachment #1: Type: text/plain, Size: 828 bytes --]
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/dma/idxd/init.c
between commit:
a409e919ca32 ("dmaengine: idxd: Refactor remove call with idxd_cleanup() helper")
from the dmaengine-fixes tree and commit:
853b01b5efd7 ("dmaengine: idxd: Remove unnecessary IOMMU_DEV_FEAT_IOPF")
from the iommu tree.
I fixed it up (the latter removed a subset of whe the former removed in
idxd_remove()) 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
[-- 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-05-16 6:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-16 6:05 linux-next: manual merge of the iommu tree with the dmaengine-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