From: Simon Horman <horms@verge.net.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hideki EIRAKU <hdk@igel.co.jp>, Joerg Roedel <joro@8bytes.org>
Subject: Re: linux-next: manual merge of the renesas tree with Linus' tree
Date: Wed, 27 Feb 2013 10:27:36 +0900 [thread overview]
Message-ID: <20130227012736.GC13199@verge.net.au> (raw)
In-Reply-To: <20130227121706.899a861e9ab868621e3a968b@canb.auug.org.au>
On Wed, Feb 27, 2013 at 12:17:06PM +1100, Stephen Rothwell wrote:
> Hi Simon,
>
> Today's linux-next merge of the renesas tree got a conflict in
> arch/arm/mach-shmobile/setup-sh73a0.c between commit 9a27dee73f55 ("ARM:
> mach-shmobile: sh73a0: Add IPMMU device") from Linus' tree and commit
> 73b21f40b61c ("ARM: shmobile: sh73a0: Do not use early devices with DT
> reference") from the renesas tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks Stephen,
resolution below looks correct to me.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
> index bdab575,6e80c5d..0000000
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@@ -781,36 -781,7 +782,36 @@@ static struct platform_device pmu_devic
> .resource = pmu_resources,
> };
>
> +/* an IPMMU module for ICB */
> +static struct resource ipmmu_resources[] = {
> + [0] = {
> + .name = "IPMMU",
> + .start = 0xfe951000,
> + .end = 0xfe9510ff,
> + .flags = IORESOURCE_MEM,
> + },
> +};
> +
> +static const char * const ipmmu_dev_names[] = {
> + "sh_mobile_lcdc_fb.0",
> +};
> +
> +static struct shmobile_ipmmu_platform_data ipmmu_platform_data = {
> + .dev_names = ipmmu_dev_names,
> + .num_dev_names = ARRAY_SIZE(ipmmu_dev_names),
> +};
> +
> +static struct platform_device ipmmu_device = {
> + .name = "ipmmu",
> + .id = -1,
> + .dev = {
> + .platform_data = &ipmmu_platform_data,
> + },
> + .resource = ipmmu_resources,
> + .num_resources = ARRAY_SIZE(ipmmu_resources),
> +};
> +
> - static struct platform_device *sh73a0_early_devices_dt[] __initdata = {
> + static struct platform_device *sh73a0_devices_dt[] __initdata = {
> &scif0_device,
> &scif1_device,
> &scif2_device,
next prev parent reply other threads:[~2013-02-27 1:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-27 1:17 linux-next: manual merge of the renesas tree with Linus' tree Stephen Rothwell
2013-02-27 1:27 ` Simon Horman [this message]
2013-03-12 3:07 Stephen Rothwell
2013-05-16 3:22 Stephen Rothwell
2013-05-16 5:04 ` Simon Horman
2013-05-16 6:12 ` Stephen Rothwell
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=20130227012736.GC13199@verge.net.au \
--to=horms@verge.net.au \
--cc=hdk@igel.co.jp \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).