From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Benoit Cousson <b-cousson@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 17 Apr 2012 13:34:18 +1000 [thread overview]
Message-ID: <20120417133418.2280ccb3897436e6c8e82398@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.
The latter seems to supercede the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Benoit Cousson <b-cousson@ti.com>
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 17 Apr 2012 13:34:18 +1000 [thread overview]
Message-ID: <20120417133418.2280ccb3897436e6c8e82398@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.
The latter seems to supercede the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the mfd tree
Date: Tue, 17 Apr 2012 13:34:18 +1000 [thread overview]
Message-ID: <20120417133418.2280ccb3897436e6c8e82398@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-generic.c between commit aa1d7775696c ("mfd:
Convert twl6040 to i2c driver, and separate it from twl core") from the
mfd tree and commit 93651b85bbd1 ("ARM: OMAP2+: board-generic: Remove i2c
static init") from the arm-soc tree.
The latter seems to supercede the former, so I used that.
--
Cheers,
Stephen Rothwell sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120417/d853f3fa/attachment.sig>
next reply other threads:[~2012-04-17 3:34 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-17 3:34 Stephen Rothwell [this message]
2012-04-17 3:34 ` linux-next: manual merge of the arm-soc tree with the mfd tree Stephen Rothwell
2012-04-17 3:34 ` Stephen Rothwell
2012-05-01 5:34 Stephen Rothwell
2012-05-01 5:34 ` Stephen Rothwell
2012-05-01 5:34 ` Stephen Rothwell
2012-05-01 22:56 ` Linus Walleij
2012-05-01 22:56 ` Linus Walleij
2013-02-04 6:04 Stephen Rothwell
2013-02-04 6:04 ` Stephen Rothwell
2013-02-04 6:04 ` Stephen Rothwell
2013-02-11 6:06 Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 6:06 ` Stephen Rothwell
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 18:52 ` Tony Lindgren
2013-02-11 19:08 ` Olof Johansson
2013-02-11 19:08 ` Olof Johansson
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:46 ` Roger Quadros
2013-02-12 14:53 ` Samuel Ortiz
2013-02-12 14:53 ` Samuel Ortiz
2013-06-21 5:54 Stephen Rothwell
2013-06-21 5:54 ` Stephen Rothwell
2013-06-21 5:54 ` Stephen Rothwell
2013-06-21 5:59 ` Gupta, Pekon
2013-06-21 5:59 ` Gupta, Pekon
2013-06-21 5:59 ` Gupta, Pekon
2013-06-28 6:01 Stephen Rothwell
2013-06-28 6:01 ` Stephen Rothwell
2013-06-28 6:01 ` 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=20120417133418.2280ccb3897436e6c8e82398@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=b-cousson@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=peter.ujfalusi@ti.com \
--cc=sameo@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.