From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <joro@8bytes.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Joerg Roedel <jroedel@suse.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: linux-next: manual merge of the iommu tree with the pm tree
Date: Mon, 29 Apr 2024 12:02:09 +0300 [thread overview]
Message-ID: <Zi9iEVnhGqjxikU_@smile.fi.intel.com> (raw)
In-Reply-To: <20240429140727.016d5758@canb.auug.org.au>
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
prev parent reply other threads:[~2024-04-29 9:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=Zi9iEVnhGqjxikU_@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=joro@8bytes.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).