From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 5/5] minimal omap5 support for v3.6 merge window
Date: Tue, 10 Jul 2012 15:53:00 +0000 [thread overview]
Message-ID: <201207101553.01188.arnd@arndb.de> (raw)
In-Reply-To: <20120710134235.GY1122@atomide.com>
On Tuesday 10 July 2012, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide•com> [120710 06:21]:
> > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
> >
> > ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5
>
> FYI, I got some merge conflicts with the am33xx and PM/smartreflex
> changes, here's how I resolved them.
>
Pulled all five branches now.
I put the am33xx clk data into the next/clk branch, as that seemed convenient.
The omap5 branch is in the next/newsoc branch, together with the new Marvell
ArmadaXP port.
I'm not extremely happy with the multi-level dependencies, but it's still
manageable at the moment, especially since I have a relatively large number
of next/* branches.
If others submit pull requests that create additional dependencies I might
have to reject them if that gets too complex.
Arnd
next prev parent reply other threads:[~2012-07-10 15:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-10 13:05 [GIT PULL 1/5] omap device tree changes for v3.6 merge window Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 2/5] omap board " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 4/5] am33xx data " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren
2012-07-10 13:05 ` [GIT PULL 3/5] omap cleanup part2 " Tony Lindgren
[not found] ` <E1SoaE5-0001gM-89@merlin.infradead.org>
2012-07-10 13:42 ` [GIT PULL 5/5] minimal omap5 support " Tony Lindgren
2012-07-10 15:53 ` Arnd Bergmann [this message]
2012-07-11 6:04 ` Tony Lindgren
2012-07-13 6:14 ` [GIT PULL 1/5] omap device tree changes " Mohammed, Afzal
2012-07-13 6:41 ` Tony Lindgren
2012-07-13 7:56 ` Tony Lindgren
2012-08-07 7:13 ` Tony Lindgren
2012-08-07 7:29 ` Mohammed, Afzal
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=201207101553.01188.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/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