From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Olof Johansson" <olof@lixom.net>,
"Arnd Bergmann" <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
"\"Heiko Stübner\"" <heiko@sntech.de>,
"Haojian Zhuang" <haojian.zhuang@gmail.com>,
"Axel Lin" <axel.lin@gmail.com>, "Liam Girdwood" <lrg@ti.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the regulator tree
Date: Fri, 9 Mar 2012 12:23:59 +0000 [thread overview]
Message-ID: <20120309122358.GM3273@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120309181755.256b898808bd14726de0e977@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
On Fri, Mar 09, 2012 at 06:17:55PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/regulator/Makefile between commit 8aa1ab9219e7 ("regulator: Sort
> Kconfig and Makefile entries") from the regulator tree and commit
> 8a16a701ad78 ("regulator: Remove bq24022 regulator driver") from the
> arm-soc tree.
Both fixups look good, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the arm-soc tree with the regulator tree
Date: Fri, 9 Mar 2012 12:23:59 +0000 [thread overview]
Message-ID: <20120309122358.GM3273@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <20120309181755.256b898808bd14726de0e977@canb.auug.org.au>
On Fri, Mar 09, 2012 at 06:17:55PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> drivers/regulator/Makefile between commit 8aa1ab9219e7 ("regulator: Sort
> Kconfig and Makefile entries") from the regulator tree and commit
> 8a16a701ad78 ("regulator: Remove bq24022 regulator driver") from the
> arm-soc tree.
Both fixups look good, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120309/6da738e5/attachment-0001.sig>
next prev parent reply other threads:[~2012-03-09 12:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 7:17 linux-next: manual merge of the arm-soc tree with the regulator tree Stephen Rothwell
2012-03-09 7:17 ` Stephen Rothwell
2012-03-09 7:17 ` Stephen Rothwell
2012-03-09 12:23 ` Mark Brown [this message]
2012-03-09 12:23 ` Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2012-03-09 7:15 Stephen Rothwell
2012-03-09 7:15 ` Stephen Rothwell
2012-03-09 7:15 ` 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=20120309122358.GM3273@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=arnd@arndb.de \
--cc=axel.lin@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lrg@ti.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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.