From: Olof Johansson <olof@lixom.net>
To: Tony Lindgren <tony@atomide.com>
Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-omap@vger.kernel.org
Subject: Re: [GIT PULL 3/4] omap device tree changes for v3.15
Date: Sat, 8 Mar 2014 23:29:04 -0800 [thread overview]
Message-ID: <20140309072904.GK16310@quad.lixom.net> (raw)
In-Reply-To: <20140303001045.GC5000@atomide.com>
On Sun, Mar 02, 2014 at 04:10:49PM -0800, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [140302 15:55]:
> > The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:
> >
> > Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-signed
> >
> > for you to fetch changes up to f777ba1780584b100ab9664cc06d04f3bb273a84:
> >
> > Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt (2014-03-02 14:22:03 -0800)
> >
> > ----------------------------------------------------------------
> >
> > Device tree related changes for omaps with minor code
> > changes also to platform data quirks that are still needed
> > for some features.
>
> FYI, this probably causes a minor overlapping additions conflict
> with the recently merged fixes. My resolve below for reference.
D'oh, saw this after I did the merge. Yes, same resolution as I used.
-Olof
WARNING: multiple messages have this Message-ID (diff)
From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 3/4] omap device tree changes for v3.15
Date: Sat, 8 Mar 2014 23:29:04 -0800 [thread overview]
Message-ID: <20140309072904.GK16310@quad.lixom.net> (raw)
In-Reply-To: <20140303001045.GC5000@atomide.com>
On Sun, Mar 02, 2014 at 04:10:49PM -0800, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [140302 15:55]:
> > The following changes since commit 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2:
> >
> > Linux 3.14-rc3 (2014-02-16 13:30:25 -0800)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-signed
> >
> > for you to fetch changes up to f777ba1780584b100ab9664cc06d04f3bb273a84:
> >
> > Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt (2014-03-02 14:22:03 -0800)
> >
> > ----------------------------------------------------------------
> >
> > Device tree related changes for omaps with minor code
> > changes also to platform data quirks that are still needed
> > for some features.
>
> FYI, this probably causes a minor overlapping additions conflict
> with the recently merged fixes. My resolve below for reference.
D'oh, saw this after I did the merge. Yes, same resolution as I used.
-Olof
next prev parent reply other threads:[~2014-03-09 7:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <pull-1393802089-910509>
2014-03-03 0:10 ` [GIT PULL 3/4] omap device tree changes for v3.15 Tony Lindgren
2014-03-03 0:10 ` Tony Lindgren
2014-03-09 7:29 ` Olof Johansson [this message]
2014-03-09 7:29 ` Olof Johansson
[not found] ` <5313bcc3.c5bf440a.7302.4a69SMTPIN_ADDED_MISSING@mx.google.com>
2014-03-09 7:18 ` [GIT PULL 2/4] omap prcm " Olof Johansson
2014-03-09 7:18 ` Olof Johansson
[not found] ` <5313bcc4.66ff420a.7636.3ca9SMTPIN_ADDED_MISSING@mx.google.com>
2014-03-09 7:26 ` [GIT PULL 3/4] omap device tree " Olof Johansson
2014-03-09 7:26 ` Olof Johansson
[not found] ` <5313bcc5.a8fc440a.467f.7ba2SMTPIN_ADDED_MISSING@mx.google.com>
2014-03-09 7:33 ` [GIT PULL 4/4] omap crossbar support " Olof Johansson
2014-03-09 7:33 ` Olof Johansson
2014-03-10 16:36 ` Tony Lindgren
2014-03-10 16:36 ` Tony Lindgren
2014-03-11 12:41 ` Sricharan R
2014-03-11 12:41 ` Sricharan R
2014-05-05 14:28 ` Sricharan R
2014-05-05 14:28 ` Sricharan R
2014-05-05 14:30 ` Sricharan R
2014-05-05 14:30 ` Sricharan R
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=20140309072904.GK16310@quad.lixom.net \
--to=olof@lixom.net \
--cc=arm@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=tony@atomide.com \
/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.