From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>
Cc: linux-next <linux-next@vger•kernel.org>,
"Nikula, Jani" <jani.nikula@linux•intel.com>
Subject: Re: Update for drm-intel.git branches
Date: Tue, 24 Feb 2015 06:05:12 +1100 [thread overview]
Message-ID: <20150224060512.6d26e491@canb.auug.org.au> (raw)
In-Reply-To: <CAKMK7uHhCVaODBoi_uSWt7eXe6P04YvwT9XboobaWUQ9VxPBVQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]
Hi Daniel,
On Tue, 3 Feb 2015 10:28:16 +0100 Daniel Vetter <daniel.vetter@ffwll•ch> wrote:
>
> I've renamed the topic/core-stuff branch to topic/drm-misc in the
> drm-intel.git. I'll leave the old branch around until you've updated
> your scripts, please reply when you've done that.
I have updates that branch now.
> Another thing: Nowadays I have 2-3 special-purpose topic branches per
> kernel release, and at least with some of them I think it would be
> good to include them into linux-next. Would it be possible for your
> scripts to pick up the list of -next branches to pick up dynamically
> from some file? That would also simplify things with the
> for-linux-next branch, which is an alias to different branches
> depending upon where in the release cycle we are.
I can't think of an easy way to do that. What others do is merge such
branches into a (stably named) branch that I include in linux-next.
When the topic branches get updated, you either just merge them into
the linux-next included branch again, or you reset that branch (to some
upstream) and remerge all the topic branches (like in the case when one
or more is not just fast forwarding or is removed).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-02-23 19:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-03 9:28 Update for drm-intel.git branches Daniel Vetter
2015-02-04 12:12 ` Stephen Rothwell
2015-02-06 7:27 ` Daniel Vetter
2015-02-23 19:05 ` Stephen Rothwell [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=20150224060512.6d26e491@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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