linux-kernel - linux-next: manual merge of the tegra tree with the i2c 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>] [day] [month] [year] [list]

Message-Id: <20130402181041.067483395c622b627826fed9@canb.auug.org.au>
Date:	Tue, 2 Apr 2013 18:10:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wolfram Sang <w.sang@...gutronix.de>,
	Wolfram Sang <wsa@...-dreams.de>,
	Danny Huang <dahuang@...dia.com>
Subject: linux-next: manual merge of the tegra tree with the i2c tree

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/tegra.c between commit 49a64ac555f1 ("i2c: tegra:
assume CONFIG_OF, remove platform data") from the i2c tree and commit
d591fdf8e23e ("ARM: tegra: expose chip ID and revision") from the tegra
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-tegra/tegra.c
index 6e1c9a9,84deeab..0000000
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@@ -30,6 -31,10 +31,8 @@@
  #include <linux/pda_power.h>
  #include <linux/platform_data/tegra_usb.h>
  #include <linux/io.h>
 -#include <linux/i2c.h>
 -#include <linux/i2c-tegra.h>
+ #include <linux/slab.h>
+ #include <linux/sys_soc.h>
  #include <linux/usb/tegra_usb_phy.h>
  
  #include <asm/mach-types.h>

Content of type "application/pgp-signature" skipped