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

2023-08-08 Thread Stephen Rothwell
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

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

2023-01-16 Thread 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:

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

2023-01-15 Thread Stephen Rothwell
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 arra