Re: [Intel-gfx] linux-next: manual merge of the fbdev tree with the drm-misc tree

[Helge Deller]

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