LinuxLists.cc - linux-next: manual merge of the fbdev tree with the drm-misc tree

2023-01-16 01:03:44

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:

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 fixed it up (I just used the former version) 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

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2023-01-16 10:32:40

by Helge Deller

[permalink] [raw]

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