From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 1/2] ARM: Keystone DTS updates for 3.15
Date: Wed, 12 Mar 2014 22:01:27 +0800 [thread overview]
Message-ID: <532068B7.2060805@ti.com> (raw)
In-Reply-To: <20140311200116.GD31877@quad.lixom.net>
On Wednesday 12 March 2014 04:01 AM, Olof Johansson wrote:
> On Wed, Mar 05, 2014 at 03:48:22PM +0800, Santosh Shilimkar wrote:
>> Hi Arm-soc folks,
>>
>> Please pull below keystone DTS updates for 3.15. It merges cleanly with
>> arm-soc 'for-next' and 'next/dt' heads.
>>
>> Please note that you get a trivial merge conflict while merging to the
>> latest Linus tip, because of bug fix commit 565bbdcd3b{ARM: keystone:
>> dts: fix clkvcp3 control register address} which got merged post
>> 3.14-rc5. If it needs to be avoided then I need to rebase the PULL
>> request on top of 3.14-rc6 when it gets tagged. Do let me know if
>> thats needed.
>>
>> The following changes since commit 38dbfb59d1175ef458d006556061adeaa8751b72:
>>
>> Linus 3.14-rc1 (2014-02-02 16:42:13 -0800)
>>
>> are available in the git repository at:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-dts
>>
>> for you to fetch changes up to 82c04f71ecacf225cdd0ea96ec91f28ca9db70a1:
>>
>> ARM: dts: keystone: add AEMIF/NAND device entry (2014-02-28 21:05:24 -0500)
>
> Merged. See comments on the per-board table in keystone.c, but that can be
> rolled back and changed on top of this.
>
Thanks. I will follow it up with the comment.
Regards,
Santosh
prev parent reply other threads:[~2014-03-12 14:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-05 7:48 [GIT PULL 1/2] ARM: Keystone DTS updates for 3.15 Santosh Shilimkar
2014-03-05 7:48 ` [GIT PULL 2/2] ARM: Keystone SOC " Santosh Shilimkar
2014-03-11 20:02 ` Olof Johansson
2014-03-11 20:01 ` [GIT PULL 1/2] ARM: Keystone DTS " Olof Johansson
2014-03-12 14:01 ` Santosh Shilimkar [this message]
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=532068B7.2060805@ti.com \
--to=santosh.shilimkar@ti.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).