From: Arnd Bergmann <arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
Cc: Ryan Mallon <rmallon@gmail.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Mika Westerberg <mika.westerberg@iki.fi>,
arm@kernel.org, linux-next@vger.kernel.org,
H Hartley Sweeten <hartleys@visionengravers.com>
Subject: Re: Request for inclusion of ep93xx tree in linux-next
Date: Wed, 2 May 2012 12:47:32 +0000 [thread overview]
Message-ID: <201205021247.33220.arnd@arndb.de> (raw)
In-Reply-To: <4FA0D48F.2090800@gmail.com>
On Wednesday 02 May 2012, Ryan Mallon wrote:
> Thanks for the tip. I leave the branches as is for the moment. If I end
> up adding any additional branches to my tree, then I will look at
> creating an ep93xx-for-next branch then. In this case, should the
> for-next branch just be a regular merge of all the other branches I
> have?
Yes. In the arm-soc tree I usually just merge all changes on top
of the for-next branch, and occasionally clean it up, starting over
with a fresh -rc release and pulling the other branches in, then
use git-diff to make sure the contents are identical to what they
were before.
> How do I make it verifiable that everything from the other
> branches has been being tested in the for-next branch?
I'm not sure I understand the question. Maybe you are looking
for 'git branch --no-merged for-next' That command will show
all local branches that are not merged into the for-next branch.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: Request for inclusion of ep93xx tree in linux-next
Date: Wed, 2 May 2012 12:47:32 +0000 [thread overview]
Message-ID: <201205021247.33220.arnd@arndb.de> (raw)
In-Reply-To: <4FA0D48F.2090800@gmail.com>
On Wednesday 02 May 2012, Ryan Mallon wrote:
> Thanks for the tip. I leave the branches as is for the moment. If I end
> up adding any additional branches to my tree, then I will look at
> creating an ep93xx-for-next branch then. In this case, should the
> for-next branch just be a regular merge of all the other branches I
> have?
Yes. In the arm-soc tree I usually just merge all changes on top
of the for-next branch, and occasionally clean it up, starting over
with a fresh -rc release and pulling the other branches in, then
use git-diff to make sure the contents are identical to what they
were before.
> How do I make it verifiable that everything from the other
> branches has been being tested in the for-next branch?
I'm not sure I understand the question. Maybe you are looking
for 'git branch --no-merged for-next' That command will show
all local branches that are not merged into the for-next branch.
Arnd
next prev parent reply other threads:[~2012-05-02 12:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-30 22:48 Request for inclusion of ep93xx tree in linux-next Ryan Mallon
2012-04-30 22:48 ` Ryan Mallon
2012-05-01 0:27 ` Stephen Rothwell
2012-05-01 0:27 ` Stephen Rothwell
2012-05-01 8:36 ` Arnd Bergmann
2012-05-01 8:36 ` Arnd Bergmann
2012-05-02 6:30 ` Ryan Mallon
2012-05-02 6:30 ` Ryan Mallon
2012-05-02 12:47 ` Arnd Bergmann [this message]
2012-05-02 12:47 ` Arnd Bergmann
2012-06-04 5:52 ` Ryan Mallon
2012-06-04 5:52 ` Ryan Mallon
2012-06-04 6:55 ` Stephen Rothwell
2012-06-04 6:55 ` 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=201205021247.33220.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=hartleys@visionengravers.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-next@vger.kernel.org \
--cc=mika.westerberg@iki.fi \
--cc=rmallon@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.