Hi Geert,
On Tue, 21 Aug 2018 10:27:48 +0200 Geert Uytterhoeven
wrote:
>
> FTR, it's not this one, but the similar one reported on Jul 19, which does not
> add the tc_port_type enum.
Right, sorry about that. Linus has now merged the mfd tree so things
are probably done now.
--
Cheers,
Steph
On Thu, Aug 16, 2018 at 8:05 PM Stephen Rothwell wrote:
> On Thu, 26 Jul 2018 15:10:06 +1000 Stephen Rothwell
> wrote:
> > Today's linux-next merge of the mfd tree got a conflict in:
> >
> > drivers/gpu/drm/i915/intel_display.h
> >
> > between commit:
> >
> > 6075546f57f8 ("drm/i915/icl: sto
Hi all,
On Thu, 26 Jul 2018 15:10:06 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the mfd tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_display.h
>
> between commit:
>
> 6075546f57f8 ("drm/i915/icl: store the port type for TC ports")
>
> from the drm-intel tree
Hi Lee,
Today's linux-next merge of the mfd tree got a conflict in:
drivers/gpu/drm/i915/intel_display.h
between commit:
6075546f57f8 ("drm/i915/icl: store the port type for TC ports")
from the drm-intel tree and commit:
9c229127aee2 ("drm/i915: hdmi: add CEC notifier to intel_hdmi")
f
