On Fri, Feb 09, 2018 at 06:30:08PM +0200, Oleksandr Andrushchenko wrote:
> -- OFFTOP --
> BTW, what is the right branch should I use
> for a new DRM driver and the patch like the above?
> I am lost a bit :)

Usual recommendation is to use:
git://anongit.freedesktop.org/drm-tip drm-tip

But note that as an integration tree it gets rebuilt every time
someone pushes something to one of the proper branches that are part of
drm-tip. So you don't want to use 'git rebase <remote>/drm-tip' to rebase
your work on top, and instead you'll want to use the rebase --onto
thing. 'dim retip' [1] (or the equivalent 'git retip' [2] in your
.gitconfig) does that for you neatly.

[1] https://01.org/linuxgraphics/gfx-docs/maintainer-tools/dim.html

[2]
 [alias]
        find-tip = log -1 --format=%H --grep=\"^drm-tip: .* integration 
manifest$\"
        retip = "!git rebase --onto drm_tip/drm-tip `git find-tip`"

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to