* linux-next: manual merge of the iommu tree with the mm tree
@ 2024-04-16 3:22 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2024-04-16 3:22 UTC (permalink / raw)
To: Joerg Roedel, Andrew Morton
Cc: Joerg Roedel, Linux Kernel Mailing List, Linux Next Mailing List,
Pasha Tatashin, Suren Baghdasaryan
[-- Attachment #1: Type: text/plain, Size: 841 bytes --]
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/iommu/amd/amd_iommu.h
between commit:
b74d58079a28 ("mm: change inlined allocation helpers to account at the call site")
from the mm-unstable branch of the mm tree and commit:
75114cbaa136 ("iommu/amd: use page allocation function provided by iommu-pages.h")
from the iommu tree.
I fixed it up (the latter removed the function changed by the former) 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:[~2024-04-16 3:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-16 3:22 linux-next: manual merge of the iommu tree with the mm 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