Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
between commit:
caab277b1de0 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
234")
from the Linus' and commit:
76c47323c151 ("video: fbdev: omap2: remove
Hi all,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/mxsfb.c
between commit:
c942fddf8793 ("treewide: Replace GPLv2 boilerplate/reference with SPDX - rule
157")
from Linus' tree and commit:
f225f1393f03 ("video: fbdev: mxsfb: Remove driver")
from
Hi Bartlomiej,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/mmp/fb/mmpfb.c
between commit:
6396bb221514 ("treewide: kzalloc() -> kcalloc()")
from Linus' tree and commit:
e0e894f59418 ("video: fbdev-MMP: Delete an error message for a failed memory
Hi Bartlomiej,
Today's linux-next merge of the fbdev tree got a conflict in:
drivers/video/fbdev/mmp/fb/mmpfb.c
between commit:
6396bb221514 ("treewide: kzalloc() -> kcalloc()")
from Linus' tree and commit:
e0e894f59418 ("video: fbdev-MMP: Delete an error message for a failed memory
4 matches
Mail list logo