* linux-next: manual merge of the iommu tree with the pm tree
@ 2024-04-29 4:07 Stephen Rothwell
2024-04-29 9:02 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-04-29 4:07 UTC (permalink / raw
To: Joerg Roedel, Rafael J. Wysocki
Cc: Andy Shevchenko, Joerg Roedel, Linux Kernel Mailing List,
Linux Next Mailing List, Rafael J. Wysocki, Robin Murphy
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
Hi all,
Today's linux-next merge of the iommu tree got a conflict in:
drivers/acpi/scan.c
between commit:
e80d4122df9c ("ACPI: scan: Move misleading comment to acpi_dma_configure_id()")
from the pm tree and commit:
f091e93306e0 ("dma-mapping: Simplify arch_setup_dma_ops()")
from the iommu tree.
I fixed it up (the latter removed the comment updated by the former, so
I just used the latter version) 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] 2+ messages in thread
* Re: linux-next: manual merge of the iommu tree with the pm tree
2024-04-29 4:07 linux-next: manual merge of the iommu tree with the pm tree Stephen Rothwell
@ 2024-04-29 9:02 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2024-04-29 9:02 UTC (permalink / raw
To: Stephen Rothwell
Cc: Joerg Roedel, Rafael J. Wysocki, Joerg Roedel,
Linux Kernel Mailing List, Linux Next Mailing List,
Rafael J. Wysocki, Robin Murphy
On Mon, Apr 29, 2024 at 02:07:27PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the iommu tree got a conflict in:
>
> drivers/acpi/scan.c
>
> between commit:
>
> e80d4122df9c ("ACPI: scan: Move misleading comment to acpi_dma_configure_id()")
>
> from the pm tree and commit:
>
> f091e93306e0 ("dma-mapping: Simplify arch_setup_dma_ops()")
>
> from the iommu tree.
>
> I fixed it up (the latter removed the comment updated by the former, so
> I just used the latter version) 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.
To me it looks like the correct fix, thank you!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-29 9:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-29 4:07 linux-next: manual merge of the iommu tree with the pm tree Stephen Rothwell
2024-04-29 9:02 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).