Received-SPF: pass (google.com: domain of linux-kernel+bounces-20221-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 9 Jan 2024 11:39:14 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Helge Deller <deller@gmx.de>, Wolfram Sang <wsa@the-dreams.de>
Cc: Heiner Kallweit <hkallweit1@gmail.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>,
 Wolfram Sang <wsa@kernel.org>
Subject: linux-next: manual merge of the fbdev tree with the i2c tree
Message-ID: <20240109113914.6178e733@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/S4XzLAGRd1An.SU4qJCQTSB";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/S4XzLAGRd1An.SU4qJCQTSB
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/video/fbdev/intelfb/intelfb_i2c.c

between commit:

  ef2984d633ce ("fbdev: remove I2C_CLASS_DDC support")

from the i2c tree and commit:

  256b7e8673a6 ("fbdev/intelfb: Remove driver")

from the fbdev tree.

I fixed it up (I just removed the file) 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_/S4XzLAGRd1An.SU4qJCQTSB
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWclbIACgkQAVBC80lX
0Gzypwf+I2UEReqUi4MWfsD7wj28JIiWIcbGGngzRduGQCAI4tQrnuCeV87JTMnK
wPqOsmH3Uws0p9wD3Hfec/yEMMrhtWlfXzW6071T8YEKUnevVIWgEQZJB4w3ahQr
xle8Z4Y25AZA592ytOE7vmtz9hLrN44B5zGLCZdn8D2eNuKn7LvzWqXUg6YydVml
dk2Ra7U3jVCP3LDM2Du+aGP/iSjia5nrIILE2ySnDmObyT54HAMm/BzUwyqn/Se+
STB5csV7Q45plkr/XnUEM5Lv5lv4P8zfWiAKanhY+HwO3e4HuAyppavWaF3ZfMhX
jUy+YIyGuxgTjs4sKpxcu9StfbaNaw==
=Nud9
-----END PGP SIGNATURE-----

--Sig_/S4XzLAGRd1An.SU4qJCQTSB--