[Intel-gfx] drm-intel/for-linux-next disabled on linux-next?

[Daniel Vetter]

On Wed, Dec 06, 2017 at 01:11:05PM +1100, Stephen Rothwell wrote:
> Hi Rodrigo,
> 
> On Tue, 5 Dec 2017 17:19:21 -0800 Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> >
> > We noticed that drm-intel/for-linux-next is currently disabled
> > on linux-next.
> 
> What gave you that idea?

next-20171205 didn't have any of the patches in drm-intel/for-linux-next
that weren't already in the drm-next branch. My for-linux-next was at

commit 39ccc9852e2b46964c9c44eba52db57413ba6d27 (HEAD -> drm-intel-next-queued)
Author: Anusha Srivatsa <anusha.srivatsa at intel.com>
Date:   Thu Nov 9 17:18:32 2017 -0800

    drm/i915/skl: DMC firmware for skylake v1.27

when I did that check. The linux-next you just pushed out has it all
again.

We realized that because our CI noticed a lockdep splat in linux-next that
we've fixed a few days ago already ...
-Daniel

> 
> > I wonder if it has to do with the compilation error we had yesterday
> > night (enum plane related). Was it the case?
> > 
> > Our solution on drm-tip was to fix at drm-rerere side when building
> > the branches so we don't break nor are forced to mix drm-misc-next
> > with drm-intel-next-queued.
> > 
> > Solution is:
> > +-      enum plane plane;
> > ++      enum i9xx_plane_id plane;
> > 
> > https://cgit.freedesktop.org/drm/drm-tip/commit/?h=rerere-cache&id=481aa1c945447716ea793699e520b3ef31ef7c83~
> > 
> > So the ideal is to apply this when merging drm-intel/for-linux-next now.
> 
> See my email earlier today which addresses exactly this.
> 
> -- 
> Cheers,
> Stephen Rothwell
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch