linux-kernel - Re: 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>] [<thread-prev] [day] [month] [year] [list]

Date:   Mon, 16 Jan 2023 10:36:05 +0100
From:   Helge Deller <deller@....de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Daniel Vetter <daniel.vetter@...ll.ch>
Cc:     Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Kees Cook <keescook@...omium.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Thomas Zimmermann <tzimmermann@...e.de>
Subject: Re: linux-next: manual merge of the fbdev tree with the drm-misc tree

On 1/16/23 01:54, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the fbdev tree got a conflict in:
>
>    include/linux/fb.h
>
> between commit:
>
>    5b6373de4351 ("drm/fbdev: Remove aperture handling and FBINFO_MISC_FIRMWARE")
>
> from the drm-misc tree and commit:
>
>    72ac3535c2c5 ("fbdev: fb.h: Replace 0-length array with flexible array")
>
> from the fbdev tree.

I've dropped the offending patch from the fbdev git tree, so it should
be resolved now.

Thanks!
Helge