From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16
Date: Thu, 22 May 2014 14:42:48 +0900 [thread overview]
Message-ID: <20140522054246.GA6307@verge.net.au> (raw)
In-Reply-To: <20140522050840.GA32618@quad.lixom.net>
On Wed, May 21, 2014 at 10:08:40PM -0700, Olof Johansson wrote:
> On Sat, May 17, 2014 at 10:24:53AM +0900, Simon Horman wrote:
> > Hi Olof, Hi Kevin, Hi Arnd,
> >
> > Please consider these Second Round of
> > Renesas ARM Based SoC r7s72100 CCF Updates for v3.16.
> >
> > This pull request is based on the previous round of
> > such requests, tagged as renesas-r7s72100-ccf-for-v3.16,
> > which I have already sent a pull-request for.
> >
> > This comprehensively addresses an oversight in patches included in
> > the pull request that it depends on, specifically leaving broken
> > non-multiplatform support in place for genmai-reference.
> >
> > This pull request has some minor conflicts with other DT changes which I
> > have previously sent pull requests for. These conflicts are in
> > arch/arm/boot/dts/Makefile. A resolution can be found in the
> > renesas-next-v3.15-rc1-20140517 tag if my renesas tree. In words:
> >
> > CONFIG_ARCH_SHMOBILE_LEGACY hunk:
> > * Remove emev2-kzm9d.dtb
> > * Remove r7s72100-genmai-reference.dtb
> > * Keep r7s72100-genmai.dtb
> >
>
> Are you sure? Shouldn't the genmai board be covered by multi now? Or
> are both multi and legacy driven by the same DTS now? Just making sure.
Both multi and legacy are driven by the same DTS, r7s72100-genmai.dtb.
> > The following changes since commit 9fbb1ae01b878e2cce9626fa6fdc9e5dcefeb6b5:
> >
> > ARM: shmobile: r7s72100: use workaround for non DT-clocks (2014-05-14 11:42:55 +0900)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-r7s72100-ccf2-for-v3.16
> >
> > for you to fetch changes up to a5176e0d9de31a54e08468f21c15dc08e006857f:
> >
> > ARM: shmobile: Remove Genmai reference DTS (2014-05-17 09:06:29 +0900)
> >
>
> Pulled, thanks.
>
>
> -Olof
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
prev parent reply other threads:[~2014-05-22 5:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 1:24 [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Simon Horman
2014-05-17 1:24 ` [PATCH 1/5] ARM: shmobile: Remove non-multiplatform Genmai reference support Simon Horman
2014-05-17 1:24 ` [PATCH 2/5] ARM: shmobile: genmai-reference: Remove legacy clock support Simon Horman
2014-05-17 1:24 ` [PATCH 3/5] ARM: shmobile: Sync Genmai DTS with Genmai reference DTS Simon Horman
2014-05-17 1:24 ` [PATCH 4/5] ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB Simon Horman
2014-05-17 1:24 ` [PATCH 5/5] ARM: shmobile: Remove Genmai reference DTS Simon Horman
2014-05-22 5:08 ` [GIT PULL] Second Round of Renesas ARM Based SoC r7s72100-ccf Updates for v3.16 Olof Johansson
2014-05-22 5:42 ` Simon Horman [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=20140522054246.GA6307@verge.net.au \
--to=horms@verge.net.au \
--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).