From: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
To: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
Cc: arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6
Date: Fri, 6 Jul 2012 20:31:01 +0000 [thread overview]
Message-ID: <201207062031.01998.arnd@arndb.de> (raw)
In-Reply-To: <1341600482-11020-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
On Friday 06 July 2012, Stephen Warren wrote:
> This is Tegra's pull requests for v3.6.
>
> Changes in V2:
> * Split for-3.6/{fixes,soc} to remove their dependency.
> * Split for-3.6/{dt,boards} to remove their dependency.
> * Added example merge resolution branches for the conflicts when merging
> the above pairs of branches.
Pulled all of those, thanks for redoing the series so quickly!
I pulled both the fixes and the cleanup branch into the arm-soc next/cleanup
one, because I usually like the fixes to come even before the cleanups, but
I think that's fine.
The merge conflicts were really trivial compared to other things I'm used
to, so there is no need to provide an example merge in cases like this,
git mergetool handles those just fine.
I appreciate the comments for each pull request, I copied them into the
merge changeset description where it makes sense. This would be even easier
if you used signed tags because then you can put the text directly into
the tag message and I don't have to copy it.
Good job also on getting to the point where you can easily add support
for a new board using DT.
Arnd
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6
Date: Fri, 6 Jul 2012 20:31:01 +0000 [thread overview]
Message-ID: <201207062031.01998.arnd@arndb.de> (raw)
In-Reply-To: <1341600482-11020-1-git-send-email-swarren@wwwdotorg.org>
On Friday 06 July 2012, Stephen Warren wrote:
> This is Tegra's pull requests for v3.6.
>
> Changes in V2:
> * Split for-3.6/{fixes,soc} to remove their dependency.
> * Split for-3.6/{dt,boards} to remove their dependency.
> * Added example merge resolution branches for the conflicts when merging
> the above pairs of branches.
Pulled all of those, thanks for redoing the series so quickly!
I pulled both the fixes and the cleanup branch into the arm-soc next/cleanup
one, because I usually like the fixes to come even before the cleanups, but
I think that's fine.
The merge conflicts were really trivial compared to other things I'm used
to, so there is no need to provide an example merge in cases like this,
git mergetool handles those just fine.
I appreciate the comments for each pull request, I copied them into the
merge changeset description where it makes sense. This would be even easier
if you used signed tags because then you can put the text directly into
the tag message and I don't have to copy it.
Good job also on getting to the point where you can easily add support
for a new board using DT.
Arnd
next prev parent reply other threads:[~2012-07-06 20:31 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-06 18:47 [GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6 Stephen Warren
2012-07-06 18:47 ` Stephen Warren
[not found] ` <1341600482-11020-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2012-07-06 18:47 ` [GIT PULL V2 1/7] ARM: tegra: for-3.6/cleanup branch Stephen Warren
2012-07-06 18:47 ` Stephen Warren
2012-07-06 18:47 ` [GIT PULL V2 2/7] ARM: tegra: for-3.6/fixes branch Stephen Warren
2012-07-06 18:47 ` Stephen Warren
2012-07-06 18:47 ` [GIT PULL V2 3/7] ARM: tegra: for-3.6/soc branch Stephen Warren
2012-07-06 18:47 ` Stephen Warren
2012-07-06 18:47 ` [GIT PULL V2 4/7] ARM: tegra: for-3.6/dt branch Stephen Warren
2012-07-06 18:47 ` Stephen Warren
2012-07-06 18:48 ` [GIT PULL V2 5/7] ARM: tegra: for-3.6/boards branch Stephen Warren
2012-07-06 18:48 ` Stephen Warren
2012-07-06 18:48 ` [GIT PULL V2 6/7] ARM: tegra: for-3.6/common-clk branch Stephen Warren
2012-07-06 18:48 ` Stephen Warren
2012-07-06 18:48 ` [GIT PULL V2 7/7] ARM: tegra: for-3.6/defconfig branch Stephen Warren
2012-07-06 18:48 ` Stephen Warren
2012-07-06 20:31 ` Arnd Bergmann [this message]
2012-07-06 20:31 ` [GIT PULL V2 0/7] ARM: tegra: pull requests for 3.6 Arnd Bergmann
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=201207062031.01998.arnd@arndb.de \
--to=arnd-r2ngtmty4d4@public.gmane.org \
--cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
/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.