Hi all,
On Tue, 9 Jan 2024 11:39:14 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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")
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.
--
Cheers,
Stephen Rothwell
Attachment:
pgplvu7CruRAy.pgp
Description: OpenPGP digital signature
