From: olof@lixom.net (Olof Johansson)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL v2] Renesas ARM Based SoC Marzen Board Removal for v4.3
Date: Thu, 6 Aug 2015 10:10:00 +0200 [thread overview]
Message-ID: <20150806081000.GA16520@localhost> (raw)
In-Reply-To: <cover.1438581659.git.horms+renesas@verge.net.au>
On Mon, Aug 03, 2015 at 03:04:55PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC marzen board removal for v4.3.
>
>
> This series removes legacy r8a7779 SoC and marzen board code.
> It aims to do do so in a way that does not introduce feature regressions
> when when booting the r8a7779/marzen board using shmobile_defconfig,
> which provides for booting using multiplatform, a scenario which previously
> used board code to provide some features including SMP.
>
> Because of the above this series modifies SoC and DT files,
> and then removes code. And because of that it was not entirely clear to
> me which branch it should go into, so I have provided it in a stand-alone
> branch.
>
> Unfortunately this branch has a number of minor conflicts with the "Renesas
> ARM Based SoC Cleanup for v4.3", tagged as renesas-cleanup-for-v4.3, which
> you have previously pulled.
>
> A resolution to those conflicts can be found in the
> renesas-next-20150730-v4.2-rc1 tag of the renesas tree.
>
> On a more positive note, I believe this to well over 8000 lines of legacy
> code removed in this cycle :)
>
>
> Changes between v1 and v2:
>
> * As requested by Olof: Do not include defconfig updates;
> these will be handled separately
>
>
> The following changes since commit d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754:
>
> Linux 4.2-rc1 (2015-07-05 11:01:52 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-marzen-board-removal-for-v4.3
Merged, but it was a messy one and it's awkward to diff with your proposed
resolution due to other differences.
Please double-check that I resolved things correctly. Thanks!
-Olof
next prev parent reply other threads:[~2015-08-06 8:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-03 6:04 [GIT PULL v2] Renesas ARM Based SoC Marzen Board Removal for v4.3 Simon Horman
2015-08-03 6:04 ` [PATCH 1/6] ARM: shmobile: r8a7779: Generic CCF and timer support Simon Horman
2015-08-03 6:04 ` [PATCH 2/6] ARM: shmobile: r8a7779: Generic SMP ops Simon Horman
2015-08-03 6:04 ` [PATCH 3/6] ARM: shmobile: marzen-reference: Remove C board code Simon Horman
2015-08-03 6:04 ` [PATCH 4/6] ARM: shmobile: r8a7779: Cleanup header file Simon Horman
2015-08-03 6:04 ` [PATCH 5/6] ARM: shmobile: marzen: Remove legacy board code Simon Horman
2015-08-03 6:04 ` [PATCH 6/6] ARM: shmobile: r8a7779: Remove legacy SoC code Simon Horman
2015-08-06 8:10 ` Olof Johansson [this message]
2015-08-07 1:28 ` [GIT PULL v2] Renesas ARM Based SoC Marzen Board Removal for v4.3 Simon Horman
2015-08-11 8:21 ` Russell King - ARM Linux
2015-08-11 12:55 ` Olof Johansson
2015-08-11 13:11 ` Geert Uytterhoeven
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=20150806081000.GA16520@localhost \
--to=olof@lixom.net \
--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).