* Update for drm-intel.git branches
@ 2015-02-03 9:28 Daniel Vetter
2015-02-04 12:12 ` Stephen Rothwell
2015-02-23 19:05 ` Stephen Rothwell
0 siblings, 2 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-02-03 9:28 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Nikula, Jani
Hi Stephen,
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.
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.
Thanks, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Update for drm-intel.git branches
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
1 sibling, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-02-04 12:12 UTC (permalink / raw)
To: Daniel Vetter; +Cc: linux-next, Nikula, Jani
[-- Attachment #1: Type: text/plain, Size: 883 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.
>
> 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'll get back to you next week about this, OK?
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Update for drm-intel.git branches
2015-02-04 12:12 ` Stephen Rothwell
@ 2015-02-06 7:27 ` Daniel Vetter
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2015-02-06 7:27 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Nikula, Jani
On Wed, Feb 4, 2015 at 1:12 PM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> 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.
>>
>> 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'll get back to you next week about this, OK?
Yeah, no problem.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Update for drm-intel.git branches
2015-02-03 9:28 Update for drm-intel.git branches Daniel Vetter
2015-02-04 12:12 ` Stephen Rothwell
@ 2015-02-23 19:05 ` Stephen Rothwell
1 sibling, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2015-02-23 19:05 UTC (permalink / raw)
To: Daniel Vetter; +Cc: linux-next, Nikula, Jani
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-23 19:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox