From: Stephen Warren <swarren@wwwdotorg.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>, Eric Anholt <eric@anholt.net>
Cc: Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Florian Fainelli <f.fainelli@gmail.com>,
linux-rpi-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: Including Raspberry Pi -next trees in linux-next
Date: Tue, 5 Jan 2016 15:52:40 -0700 [thread overview]
Message-ID: <568C4938.1010609@wwwdotorg.org> (raw)
In-Reply-To: <20160106093239.21848a48@canb.auug.org.au>
On 01/05/2016 03:32 PM, Stephen Rothwell wrote:
> Hi Eric,
>
> On Tue, 05 Jan 2016 22:26:33 +0100 Arnd Bergmann <arnd@arndb.de> 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.
FWIW, I almost always build/test the for-next branch rather than (or
sometimes in addition to) the individual branches, and since I do so
much with that branch, I use some scripts to automate generating it, and
pushing all the branches to kernel.org. The Tegra version of those
scripts is at:
> https://git.kernel.org/cgit/linux/kernel/git/tegra/maint-scripts.git/tree/
In particular, see merge-linux-tegra.sh and its configuration file
tegra-branches.sh.dot. Also push-linux-tegra.sh does all the pushes.
prev parent reply other threads:[~2016-01-05 22:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-26 21:15 Including Raspberry Pi -next trees in linux-next Eric Anholt
2016-01-04 7:26 ` Stephen Rothwell
2016-01-05 20:06 ` Eric Anholt
2016-01-05 20:09 ` Florian Fainelli
2016-01-05 20:22 ` Stephen Warren
2016-01-05 21:26 ` Arnd Bergmann
2016-01-05 22:32 ` Stephen Rothwell
2016-01-05 22:52 ` Stephen Warren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=568C4938.1010609@wwwdotorg.org \
--to=swarren@wwwdotorg.org \
--cc=arnd@arndb.de \
--cc=eric@anholt.net \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox