linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Stephen Warren <swarren@nvidia.com>,
	Colin Cross <ccross@android.com>, Olof Johansson <olof@lixom.net>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Wolfram Sang <w.sang@pengutronix.de>,
	Wolfram Sang <wsa@the-dreams.de>,
	Danny Huang <dahuang@nvidia.com>
Subject: linux-next: manual merge of the tegra tree with the i2c tree
Date: Tue, 2 Apr 2013 18:10:41 +1100	[thread overview]
Message-ID: <20130402181041.067483395c622b627826fed9@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 923 bytes --]

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@canb.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>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

                 reply	other threads:[~2013-04-02  7:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20130402181041.067483395c622b627826fed9@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ccross@android.com \
    --cc=dahuang@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=swarren@nvidia.com \
    --cc=w.sang@pengutronix.de \
    --cc=wsa@the-dreams.de \
    /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).