From: James Bottomley <James.Bottomley@HansenPartnership•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Kyle McMartin <kyle@mcmartin•ca>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org, Helge Deller <deller@gmx•de>,
linux-parisc@vger•kernel.org,
Uwe Kleine-Koenig <u.kleine-koenig@pengutronix•de>,
Steven Rostedt <srostedt@redhat•com>
Subject: Re: linux-next: manual merge of the tracing tree with the parisc tree
Date: Thu, 02 Apr 2009 13:54:43 +0000 [thread overview]
Message-ID: <1238680483.3383.7.camel@mulgrave.int.hansenpartnership.com> (raw)
In-Reply-To: <20090402223205.e4ab7b5e.sfr@canb.auug.org.au>
On Thu, 2009-04-02 at 22:32 +1100, Stephen Rothwell wrote:
> Hi Kyle,
>
> On Wed, 1 Apr 2009 13:50:34 -0400 Kyle McMartin <kyle@mcmartin•ca> wrote:
> >
> > What's the optimal way to sort out multiple branches in this tree?
> > Apparently Andrew is cross with me because the rtc-parisc branch didn't
> > get picked up... Should I put a list of branches in my kernel.org
> > public_html or something?
>
> I am not quite sure what you are getting at. If you have multiple trees
> (or branches in a tree), I can merge them separately into linux-next -
> just tell me what they are.
Actually, the traditional way for a multi branch tree (something like
Jens' Block tree) which contains all manner of branches, some of which
are experimental and shouldn't be in linux-next, is to have a next
branch into which you manually merge all branches that should be
included.
James
next prev parent reply other threads:[~2009-04-02 13:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-01 0:37 linux-next: manual merge of the tracing tree with the parisc tree Stephen Rothwell
2009-04-01 6:54 ` Uwe Kleine-König
2009-04-01 11:05 ` Ingo Molnar
2009-04-01 11:10 ` Uwe Kleine-König
2009-04-01 11:19 ` Ingo Molnar
2009-04-01 17:50 ` Kyle McMartin
2009-04-02 11:32 ` Stephen Rothwell
2009-04-02 13:54 ` James Bottomley [this message]
2009-04-02 15:22 ` Kyle McMartin
2009-04-03 14:15 ` Ingo Molnar
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=1238680483.3383.7.camel@mulgrave.int.hansenpartnership.com \
--to=james.bottomley@hansenpartnership$(echo .)com \
--cc=deller@gmx$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=kyle@mcmartin$(echo .)ca \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=srostedt@redhat$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
/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