Received-SPF: pass (google.com: domain of linux-kernel+bounces-161721-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 29 Apr 2024 14:07:27 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <joro@8bytes.org>, "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, 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: linux-next: manual merge of the iommu tree with the pm tree
Message-ID: <20240429140727.016d5758@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7lU3zzmZSsQQJh4lyfcrIIC";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/7lU3zzmZSsQQJh4lyfcrIIC
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
Cheers,
Stephen Rothwell

--Sig_/7lU3zzmZSsQQJh4lyfcrIIC
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYvHP8ACgkQAVBC80lX
0GzSbgf+OxwUfsY9Xy2mtx6CzzznbBTeYjt3V3bYWnXYJrLc46yrq51bj08E36Za
sa/zENKQb7jEf0Jpvgm+CkMZYnsRLUH3CG6cm8cO3hPm4ZDCoIWK6uQQFRGsomSS
uYQ3dxexU4f1Nxkvnzlc77RopNScbrFFjJOcJIJaU1W71xeyyGtCVdAr0O1N38qg
t789mkIYvfSkCED0ar1W/b49NX/hwd8KVLqLkt6LT02UQDaj8FOB3u/FFSER9JZb
Vw+Pjv3cif96Be1nizkw1RFzSIOYMUi3rPsPWYW+U/yPDOF+1e22tHyDeYRpKTtx
Q8iz836FL464tHmoh0Gth0adCZU+Kw==
=lyV5
-----END PGP SIGNATURE-----

--Sig_/7lU3zzmZSsQQJh4lyfcrIIC--