Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/vermilion/vermilion.c
between commit:
76f92201b821 ("fbdev: Push pgprot_decrypted() into mmap implementations")
from the drm tree and commit:
d8a47ee16884 ("fbdev: Remove support for Carillo Ranch
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/amba-clcd.c
between commit:
76f92201b821 ("fbdev: Push pgprot_decrypted() into mmap implementations")
from the drm tree and commit:
13366c25125e ("fbdev: amba-clcd: Delete the old CLCD driver")
fr
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/mx3fb.c
between commit:
8a4675ebbd30 ("fbdev: Remove FBINFO_FLAG_DEFAULT from framebuffer_alloc()'ed
structs")
from the drm tree and commit:
87ac8777d424 ("fbdev: mx3fb: Remove the driver")
from
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/hitfb.c
between commit:
bb47f218fd01 ("fbdev/hitfb: Cast I/O offset to address")
from the drm tree and commit:
dadeeffbe525 ("fbdev: hitfb: Use NULL for pointers")
from the fbdev tree.
I fixed it
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 dr
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 tr
On 10/4/22 04:27, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/tridentfb.c
between commit:
145eed48de27 ("fbdev: Remove conflicting devices on PCI bus")
from the drm tree and commit:
d738bf0123d6 ("fbdev: tridentf
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/tridentfb.c
between commit:
145eed48de27 ("fbdev: Remove conflicting devices on PCI bus")
from the drm tree and commit:
d738bf0123d6 ("fbdev: tridentfb: Fix missing pci_disable_device() in probe
a
