Received-SPF: pass (google.com: domain of linux-kernel+bounces-127240-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 2 Apr 2024 11:31:16 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Lee Jones <lee@kernel.org>, Bjorn Helgaas <bhelgaas@google.com>, Lorenzo
 Pieralisi <lpieralisi@kernel.org>, Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?=
 <kw@linux.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Damien Le Moal
 <dlemoal@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mfd tree with the pci tree
Message-ID: <20240402113116.70d6a885@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fA3L7O4dNU2PELsc/ffE9/0";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/fA3L7O4dNU2PELsc/ffE9/0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the mfd tree got a conflict in:

  drivers/mfd/intel-lpss-pci.c

between commit:

  5133224938b9 ("mfd: intel-lpss: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGAC=
Y")

from the pci tree and commit:

  e42199bf13d4 ("mfd: intel-lpss: Switch over to MSI interrupts")

from the mfd tree.

I fixed it up (I just used the latter) 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_/fA3L7O4dNU2PELsc/ffE9/0
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYLUdQACgkQAVBC80lX
0GzDIAf9ESRcmKxSd5rjJ7XD2ySrZXXgVr3ITndM2xQrulH4evuq8qzdk5YKWAnq
YY+AKBWAG4OEx/pN6XwQp/GlT46cX988wtlb3tatO/GBBu4GQsTK8I2pW+viT2L3
puOqx5UMX+CiPYK+I38v3WQ/mXgvp9I6fEe7/7qvi3gZDolEG+lkL+55vAoxEw3N
CRJAZnLX0q1aEv5GwVwd4LTo+jJuuJkTvvFLR9Xtq+KMJrIwh1t32svDMgSlHzgG
SFlTAHLUCpMdoM6WdnYp7wIOi0LnSH/zWvG35y1aHuHdQ9yI+OUUwCa7uE+uZgbL
jZUYCp4lPcAVF6Y/VjO5VC4Xa3lgvQ==
=fq+a
-----END PGP SIGNATURE-----

--Sig_/fA3L7O4dNU2PELsc/ffE9/0--