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
