linux-kernel - linux-next: manual merge of the arm tree with the arm-current 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]

Message-Id: <20101012103314.41b00cbe.sfr@canb.auug.org.au>
Date:	Tue, 12 Oct 2010 10:33:14 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Russell King <rmk@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Uwe Kleine-König" 
	<u.kleine-koenig@...gutronix.de>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	"Eric Bénard" <eric@...rea.com>
Subject: linux-next: manual merge of the arm tree with the arm-current tree

Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-imx/mach-cpuimx27.c between commit
4793ca4028e4dcdbf2740db50995c9378ded3cf8 ("cpuimx27: fix i2c bus
selection") from the arm-current tree and commit
77a406da5a5b76445a816d5f043fc9aef4026ff1 ("ARM: imx: fix name of macros
to add imx-i2c devices") from the arm tree.

I fixed it up (see below) can can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index 6830afd,28f73a1..0000000
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -259,8 -258,9 +258,9 @@@ static void __init eukrea_cpuimx27_init
  	i2c_register_board_info(0, eukrea_cpuimx27_i2c_devices,
  				ARRAY_SIZE(eukrea_cpuimx27_i2c_devices));
  
- 	imx27_add_i2c_imx0(&cpuimx27_i2c1_data);
 -	imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);
++	imx27_add_imx_i2c(0, &cpuimx27_i2c1_data);
  
+ 	imx27_add_fec(NULL);
  	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
  
  #if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/