Received-SPF: pass (google.com: domain of linux-kernel+bounces-161956-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 29 Apr 2024 12:02:09 +0300
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
Message-ID: <Zi9iEVnhGqjxikU_@smile.fi.intel.com>
References: <20240429140727.016d5758@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240429140727.016d5758@canb.auug.org.au>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo

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