linux-kernel - Re: linux-next: manual merge of the fbdev tree with the i2c tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20240117103550.05ccef37@canb.auug.org.au>
Date: Wed, 17 Jan 2024 10:35:50 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Wolfram Sang <wsa@...-dreams.de>
Cc: Helge Deller <deller@....de>, Heiner Kallweit <hkallweit1@...il.com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Thomas Zimmermann
 <tzimmermann@...e.de>, Wolfram Sang <wsa@...nel.org>
Subject: Re: linux-next: manual merge of the fbdev tree with the i2c tree

Hi all,

On Tue, 9 Jan 2024 11:39:14 +1100 Stephen Rothwell <sfr@...b.auug.org.au> 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

Content of type "application/pgp-signature" skipped