From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 2/6] omap cleanup for v3.11 merge window
Date: Mon, 17 Jun 2013 03:33:42 -0700 [thread overview]
Message-ID: <20130617103342.GL20992@atomide.com> (raw)
In-Reply-To: <20130614212815.GB17326@quad.lixom.net>
* Olof Johansson <olof@lixom.net> [130614 14:34]:
> On Wed, Jun 12, 2013 at 11:24:33AM -0700, Tony Lindgren wrote:
> > The following changes since commit d683b96b072dc4680fc74964eca77e6a23d1fa6e:
> >
> > Linux 3.10-rc4 (2013-06-02 17:11:17 +0900)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
> >
> > for you to fetch changes up to 09182ab11b49b67d04598b19eb89cf0bbd672a60:
> >
> > ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods (2013-06-12 09:41:46 -0700)
> >
> > ----------------------------------------------------------------
> > Move omap4 over to device tree based booting. This allows us to get rid
> > a big pile of platform init code for things that are already handled by
> > device tree related code. As am33xx is already device tree based, we
> > can also remove the same data for am33xx.
>
> Hm. This one has a somewhat silly conflict with the am33xx hwmod fix for uart2.
> I.e. the fix is reverted since the code is no longer needed -- data comes from
> device tree. Please double-check my merge resolution on it though.
Thanks yes that should not be needed any longer in the hwmod data.
Regards,
Tony
next prev parent reply other threads:[~2013-06-17 10:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-12 18:24 [GIT PULL 1/6] non-critical omap fixes for v3.11 merge window Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 2/6] omap cleanup " Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 3/6] omap pm changes " Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 6/6] omap5 data " Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 4/6] omap gpmc changes " Tony Lindgren
2013-06-12 18:24 ` [GIT PULL 5/6] omap soc " Tony Lindgren
[not found] ` <51b8bce9.1265310a.49c1.ffff940eSMTPIN_ADDED_MISSING@mx.google.com>
2013-06-14 21:28 ` [GIT PULL 2/6] omap cleanup " Olof Johansson
2013-06-17 10:33 ` Tony Lindgren [this message]
[not found] ` <51b8bcea.46dbe00a.6f0b.fffffdf1SMTPIN_ADDED_MISSING@mx.google.com>
2013-06-14 21:35 ` [GIT PULL 3/6] omap pm changes " Olof Johansson
[not found] ` <51b8bcec.41ace00a.4b4c.0772SMTPIN_ADDED_MISSING@mx.google.com>
2013-06-14 21:35 ` [GIT PULL 5/6] omap soc " Olof Johansson
[not found] ` <E1Umpk1-0005eT-9P@merlin.infradead.org>
2013-06-14 21:36 ` [GIT PULL 6/6] omap5 data " Olof Johansson
2013-06-17 10:37 ` Tony Lindgren
[not found] ` <51b8bceb.d447310a.2e65.ffff937fSMTPIN_ADDED_MISSING@mx.google.com>
2013-06-14 21:37 ` [GIT PULL 4/6] omap gpmc changes " Olof Johansson
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=20130617103342.GL20992@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).