From: Vineet Gupta <Vineet.Gupta1@synopsys.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next <linux-next@vger.kernel.org>
Subject: Re: Multiple for-next branches from same tree
Date: Thu, 7 Mar 2013 17:55:21 +0530 [thread overview]
Message-ID: <51388731.5020805@synopsys.com> (raw)
In-Reply-To: <20130307222446.d2b14a7a3785ef99dbf098b8@canb.auug.org.au>
On Thursday 07 March 2013 04:54 PM, Stephen Rothwell wrote:
> Hi Vineet,
>
> On Thu, 7 Mar 2013 11:33:54 +0530 Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote:
>> With ARC arch merged in 3.9-rc1 I feel the need for a revised workflow.
>>
>> I intend to have 2 branches for -next exposure: for-curr and for-next.
>> * for-curr would contain the bug fixes for this release to be sent to Linus at
>> some point in time.
>> * for-next obviously is next release stuff and will be rebased off for-curr.
> I have several sets of branches like that and it works fine.
>
> Occasionally, the branches will conflict, but that can be sorted by
> merging the for-curr branch into the for-next branch after Linus has
> merged the for-curr branch.
Thanks for your reply Stephen. In that case, can you add the following additional
arc branch to -next
git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git for-curr
-Vineet
next prev parent reply other threads:[~2013-03-07 12:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 6:03 Multiple for-next branches from same tree Vineet Gupta
2013-03-07 11:24 ` Stephen Rothwell
2013-03-07 12:25 ` Vineet Gupta [this message]
2013-03-07 13:46 ` Stephen Rothwell
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=51388731.5020805@synopsys.com \
--to=vineet.gupta1@synopsys.com \
--cc=linux-next@vger.kernel.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