Received-SPF: pass (google.com: domain of linux-kernel+bounces-28377-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 17 Jan 2024 10:35:50 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: Helge Deller <deller@gmx.de>, 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: Re: linux-next: manual merge of the fbdev tree with the i2c tree
Message-ID: <20240117103550.05ccef37@canb.auug.org.au>
In-Reply-To: <20240109113914.6178e733@canb.auug.org.au>
References: <20240109113914.6178e733@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/fRlDahp=ZCP3F83WHkgmat4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

On Tue, 9 Jan 2024 11:39:14 +1100 Stephen Rothwell <sfr@canb.auug.org.au> w=
rote:
>
> Hi all,
>=20
> Today's linux-next merge of the fbdev tree got a conflict in:
>=20
>   drivers/video/fbdev/intelfb/intelfb_i2c.c
>=20
> between commit:
>=20
>   ef2984d633ce ("fbdev: remove I2C_CLASS_DDC support")
>=20
> from the i2c tree and commit:
>=20
>   256b7e8673a6 ("fbdev/intelfb: Remove driver")

This is now commit

  689237ab37c5 ("fbdev/intelfb: Remove driver")

in Linus' 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.

This is now a conflict between the i2c tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/fRlDahp=ZCP3F83WHkgmat4
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWnEtYACgkQAVBC80lX
0GyudQf/Z/mpbXa+b+XsD23H9VsHyrj/k4L4keARN1c9rhDccUK9kZIrx88W7Ys1
ps+3LTRhdBnurUO6SZAXbAcQP/uEHMrRSlapbjStMfdvTdbohzLZ0SiW9UtaFSHL
4TOeESCIoQ86EPmaDoFQtxqTp5eegjji7rp3YvvSoJxS8fI5YqgJk4p24mmbzmk/
bAXVtIyeu/SnOmntfiBa6CNEkLfYn1zYQj+HLTxRiVJEq84GOqI+slrZTrOnJMqj
JrMA/8b067WxCL7E4y/TjUpHBteh/J3wo9NdIxTHekyajyabzXAo2+Ru2AiTk3Z6
hFr+tdtvDNAw59KChMORq78GSU66bg==
=Es1E
-----END PGP SIGNATURE-----

--Sig_/fRlDahp=ZCP3F83WHkgmat4--