* linux-next: manual merge of the fbdev tree with the drm-misc tree
@ 2023-08-09 0:36 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2023-08-09 0:36 UTC (permalink / raw)
To: Helge Deller, Daniel Vetter
Cc: Intel Graphics, DRI, Fabio Estevam, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the fbdev tree with the drm-misc tree
2023-01-16 0:54 Stephen Rothwell
@ 2023-01-16 9:36 ` Helge Deller
0 siblings, 0 replies; 3+ messages in thread
From: Helge Deller @ 2023-01-16 9:36 UTC (permalink / raw)
To: Stephen Rothwell, Daniel Vetter
Cc: Intel Graphics, DRI, Kees Cook, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the fbdev tree with the drm-misc tree
@ 2023-01-16 0:54 Stephen Rothwell
2023-01-16 9:36 ` Helge Deller
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2023-01-16 0:54 UTC (permalink / raw)
To: Helge Deller, Daniel Vetter
Cc: Intel Graphics, DRI, Kees Cook, Linux Kernel Mailing List,
Linux Next Mailing List, Thomas Zimmermann
[-- Attachment #1: Type: text/plain, Size: 772 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-08-09 0:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-09 0:36 linux-next: manual merge of the fbdev tree with the drm-misc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-01-16 0:54 Stephen Rothwell
2023-01-16 9:36 ` Helge Deller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).