Re: Including Raspberry Pi -next trees in linux-next

[Stephen Rothwell]

Hi Eric,

On Tue, 05 Jan 2016 22:26:33 +0100 Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> On Tuesday 05 January 2016 13:22:49 Stephen Warren wrote:
> > >>>
> > >>> branches:
> > >>> drm-vc4-next
> > >>> bcm2835-dt-next
> > >>> bcm2835-soc-next
> > >>> bcm2835-drivers-next
> > >>> bcm2385-defconfig-next
> > >>> (bcm2835-maintainers-next is a placeholder since we have nothing for it
> > >>> this round)  
> > 
> > Typically maintainers merge everything together into a single "for-next" 
> > to maintain a reasonable set of branches. I guess it doesn't affect me 
> > so my opinion isn't too relevant though:-)  
> 
> In my experience the common for-next branch works best because
> you can change the set of branches that get merged into it as
> needed. If there are 6 branches today, it's quite likely that there
> will be another one in the future and if only one branch gets
> merged into for-next, you don't need to worry about updating the list.

Certainly, that would be easier for me.  Though you may want to keep
the drm-vc4-next branch separate since that get merged via a different
tree (and can appear at a different point in my merge list).

It does mean an extra step for you i.e. you would need to merge all the
relevant branches into the single "for-next" branch, but that should
not be too big an imposition.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/