linux-kernel - linux-next: manual merge of the renesas tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 27 Feb 2013 12:17:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hideki EIRAKU <hdk@...l.co.jp>, Joerg Roedel <joro@...tes.org>
Subject: linux-next: manual merge of the renesas tree with Linus' tree

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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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,

Content of type "application/pgp-signature" skipped