linux-kernel - linux-next: manual merge of the fbdev tree with the drm-misc 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>] [day] [month] [year] [list]

Message-ID: <20230809103626.782dd87d@canb.auug.org.au>
Date:   Wed, 9 Aug 2023 10:36:26 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Helge Deller <deller@....de>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Fabio Estevam <festevam@...x.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thomas Zimmermann <tzimmermann@...e.de>
Subject: linux-next: manual merge of the fbdev tree with the drm-misc tree

Hi all,

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

  drivers/video/fbdev/Kconfig

between commit:

  8c47895b70a2 ("fbdev/mx3fb: Use fbdev I/O helpers")

from the drm-misc tree and commit:

  87ac8777d424 ("fbdev: mx3fb: Remove the driver")

from the fbdev tree.

I fixed it up (the latter removed the lines modified by the former,
so 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped