| Message ID | 20221213111612.7bc1f917@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the fbdev tree with the drm tree | expand |
On 12/13/22 01:16, Stephen Rothwell wrote: > Today's linux-next merge of the fbdev tree got a conflict in: > drivers/video/fbdev/Kconfig > between commit: > c8a17756c425 ("drm/ofdrm: Add ofdrm for Open Firmware framebuffers") > from the drm tree and commit: > 225e095bbd3a ("fbdev: offb: make offb driver tristate") > from the fbdev tree. I've dropped that patch from the fbdev git tree to resolve the conflict. It didn't applied cleanly anyway, so @Randy please resend a new patch if required. Thanks! Helge > I fixed it up (see below) 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. >
diff --cc drivers/video/fbdev/Kconfig index 71019b167f8b,a529511f7f53..000000000000 --- a/drivers/video/fbdev/Kconfig
Hi all, Today's linux-next merge of the fbdev tree got a conflict in: drivers/video/fbdev/Kconfig between commit: c8a17756c425 ("drm/ofdrm: Add ofdrm for Open Firmware framebuffers") from the drm tree and commit: 225e095bbd3a ("fbdev: offb: make offb driver tristate") from the fbdev tree. I fixed it up (see below) 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.