From: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
To: Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@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,
swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org,
ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org
Subject: Re: [GIT PULL 0/6] Tegra branches for 3.4
Date: Sun, 4 Mar 2012 21:27:52 +0000 [thread overview]
Message-ID: <201203042127.53017.arnd@arndb.de> (raw)
In-Reply-To: <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
On Sunday 04 March 2012, Olof Johansson wrote:
> Hi Arnd,
>
> Below are the 6 pull requests for Tegra platforms for 3.4. This is also
> likely my last merge request for tegra material (besides possibly some
> stray patches between now and the merge window), since I am handing off
> main maintainership to Stephen Warren for the next merge window.
>
> Each branch is documented in the tag (they are all tag pull requests), as
> well as in the emails below. Nothing too controversial.
>
> There are a handful of trivial merge conflicts between the branches,
> mostly to the Makefile due to context chances. I also had a local
> issue where git auto-resolved the merge of the T30 SMP branch into
> my for-next branch, and did NOT remove the mach/system.h include at
> arch/arm/mach-tegra/common.c. This results in a build break since it
> has been removed in rmk/for-armsoc. So just a heads up in case you see
> the same thing.
Hi Olof,
I've pulled them all into the respective branches. I'll send out a
status of all the stuff (and missing stuff) in arm-soc.git tomorrow
and then hand back over to you for a while until you need to shift
your own focus again.
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 0/6] Tegra branches for 3.4
Date: Sun, 4 Mar 2012 21:27:52 +0000 [thread overview]
Message-ID: <201203042127.53017.arnd@arndb.de> (raw)
In-Reply-To: <1330892042-32065-1-git-send-email-olof@lixom.net>
On Sunday 04 March 2012, Olof Johansson wrote:
> Hi Arnd,
>
> Below are the 6 pull requests for Tegra platforms for 3.4. This is also
> likely my last merge request for tegra material (besides possibly some
> stray patches between now and the merge window), since I am handing off
> main maintainership to Stephen Warren for the next merge window.
>
> Each branch is documented in the tag (they are all tag pull requests), as
> well as in the emails below. Nothing too controversial.
>
> There are a handful of trivial merge conflicts between the branches,
> mostly to the Makefile due to context chances. I also had a local
> issue where git auto-resolved the merge of the T30 SMP branch into
> my for-next branch, and did NOT remove the mach/system.h include at
> arch/arm/mach-tegra/common.c. This results in a build break since it
> has been removed in rmk/for-armsoc. So just a heads up in case you see
> the same thing.
Hi Olof,
I've pulled them all into the respective branches. I'll send out a
status of all the stuff (and missing stuff) in arm-soc.git tomorrow
and then hand back over to you for a while until you need to shift
your own focus again.
Arnd
next prev parent reply other threads:[~2012-03-04 21:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-04 20:13 [GIT PULL 0/6] Tegra branches for 3.4 Olof Johansson
2012-03-04 20:13 ` Olof Johansson
[not found] ` <1330892042-32065-1-git-send-email-olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2012-03-04 20:13 ` [GIT PULL 1/6] ARM: tegra: cleanups and fixes Olof Johansson
2012-03-04 20:13 ` [GIT PULL 2/6] ARM: tegra: device tree updates Olof Johansson
2012-03-04 20:13 ` [GIT PULL 3/6] ARM: tegra: SoC updates Olof Johansson
2012-03-04 20:14 ` [GIT PULL 4/6] ARM: tegra: SoC driver updates Olof Johansson
2012-03-04 20:14 ` [GIT PULL 5/6] ARM: tegra: Tegra 30 SMP support Olof Johansson
2012-03-04 20:14 ` [GIT PULL 6/6] ARM: tegra: board updates Olof Johansson
2012-03-04 20:41 ` [GIT PULL 0/6] Tegra branches for 3.4 Olof Johansson
2012-03-04 20:41 ` Olof Johansson
[not found] ` <CAOesGMgahK_wkM1PGb55D1gEzbYfJVQKO_XSqMPbw5wTP09Fag-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-03-05 17:02 ` Arnd Bergmann
2012-03-05 17:02 ` Arnd Bergmann
2012-03-04 21:27 ` Arnd Bergmann [this message]
2012-03-04 21:27 ` 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=201203042127.53017.arnd@arndb.de \
--to=arnd-r2ngtmty4d4@public.gmane.org \
--cc=arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \
--cc=swarren-DDmLM1+adcrQT0dZR+AlfA@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.