Hi all,
On Fri, 3 Jul 2020 14:35:50 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the kspp tree got a conflict in:
>
> drivers/gpu/drm/drm_edid.c
>
> between commit:
>
> 948de84233d3 ("drm : Insert blank lines after declarations.")
>
> from the drm-misc tree and commit:
Hi all,
Today's linux-next merge of the kspp tree got a conflict in:
drivers/gpu/drm/drm_edid.c
between commit:
948de84233d3 ("drm : Insert blank lines after declarations.")
from the drm-misc tree and commit:
80b89ab785a4 ("treewide: Remove uninitialized_var() usage")
from the kspp tre
Hi Kees,
Today's linux-next merge of the kspp tree got a conflict in:
include/drm/drm_drv.h
between commit:
91faa0478b59 ("drm: drop extern from function decls")
from the drm-misc tree and commit:
6bbaac116552 ("initify: Mark functions with the __nocapture attribute")
from the kspp tre
