[Intel-gfx] [drm-intel] Diverse GIT branches?

[Daniel Vetter]

On Tue, Jul 02, 2013 at 01:23:53PM +0200, Sedat Dilek wrote:
> Hi Daniel,
> 
> can you explain the usage of the diverse GIT branches you maintain?
> 
> OK, I know we are in between a merge-window and it's probably me who
> is confused.
> My focus is especially on the branches against -next.
> 
> drm-intel-fixes <--- For current Linux-upstream
> 
> for-linux-next <--- For current Linux-next (see [3])
> 
> drm-intel-next-queued <--- For "Linux-upstream version+1" aka
> "for-3.12" means "post-3.11-rc1 material for Linux-next"???
> 
> drm-intel-nightly <--- (drm-intel-fixes + for-linux-next +
> drm-intel-next-queued)
> 
> for-airlied <--- for git-pulls to airlied
> 
> drm-intel-next <--- ???
> 
> drm-intel-testing <--- ???
> 
> It might be less confusing to use branches like "for-3.11" or
> "for-3.12" for future development trees (see linux-block/linux-wq)?
> 
> Sorry, if I keep you from more important stuff.

I've figured that generally interesting to clarify, so went for a little
blog post "drm/i915 Brances Explained":

http://blog.ffwll.ch/2013/07/drmi915-branches-explained.html

Cheers, Daniel

> 
> Regards,
> - Sedat -
> 
> [1] http://git.kernel.org/cgit/linux/kernel/git/axboe/linux-block.git
> [2] http://git.kernel.org/cgit/linux/kernel/git/tj/wq.git
> [3] http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/Next/Trees?id=next-20130702#n120

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch