drm-core-next vs drm-next

[David Airlie]

----- Original Message -----
> From: "James Simmons" <jsimmons at infradead.org>
> To: "Dave Airlie" <airlied at gmail.com>
> Cc: "dri-devel" <dri-devel at lists.freedesktop.org>
> Sent: Thursday, 15 March, 2012 3:18:14 PM
> Subject: Re: drm-core-next vs drm-next
> 
> 
> > as a headsup, if you are basing a tree on mine, please use
> > drm-core-next not drm-next itself as a basis for your tree.
> > 
> > At the moment they've diverged as I've put the UDL kms driver into
> > drm-next but not drm-core-next as it needs an external fbdev patch
> > to
> > work.
> 
> Is this temporary?

Well its the way things are supposed to work, but I realise I haven't mentioned that in a while.

drm-core-next isn't going to be rebased, but drm-next sometimes has to get a bit messy just to ensure upstream -next can build.

Dave.