From: Liam Girdwood <lrg@slimlogic.co.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Eduardo Valentin <eduardo.valentin@nokia.com>,
Rajendra Nayak <rnayak@ti.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Balaji T K <balajitk@ti.com>
Subject: Re: linux-next: manual merge of the voltage tree with Linus' tree
Date: Tue, 15 Dec 2009 09:48:05 +0000 [thread overview]
Message-ID: <1260870485.3591.25.camel@odin> (raw)
In-Reply-To: <20091215133808.cd3d4b8b.sfr@canb.auug.org.au>
Hi Stephen,
On Tue, 2009-12-15 at 13:38 +1100, Stephen Rothwell wrote:
> Hi Liam,
>
> Today's linux-next merge of the voltage tree got a conflict in
> drivers/regulator/twl-regulator.c between commit
> 441a450554dada1c59fc06fdf068cb0eeba53c6d ("regulator: Add support for
> twl6030 regulators") from Linus' tree and commits
> 6360cf42ae51be5f6e6e72d6e81f202d9db0f7e9 ("twl4030-regulator: Remove
> regulator from all groups when disabling") and
> 3277b9fce0fcaa68d5947429e062163852ebc6fb ("twl4030-regulator: Add all TWL
> regulators to twreg_info") from the voltage tree.
>
> I cannot begin to fix this mess up. I do wonder why the regulator patch
> above was never in linux-next before being sent upstream yesterday
> (Samuel?). All I can do is use the version of the voltage tree from
> next-20091120 (commit id b0a7a2ad0aebb35934de6d2509c73fe93a362c0e) for
> today and hope that Liam can do the merge with Linus' tree.
>
Sorry about this. There were some large patch sets that did span both
mfd and regulator recently.
I'll fix and do my pull request today.
Liam
next prev parent reply other threads:[~2009-12-15 9:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 2:38 linux-next: manual merge of the voltage tree with Linus' tree Stephen Rothwell
2009-12-15 9:48 ` Liam Girdwood [this message]
2009-12-15 12:14 ` Liam Girdwood
2009-12-15 14:04 ` Juha Keski-Saari
2009-12-15 14:23 ` Peter Ujfalusi
-- strict thread matches above, loose matches on Subject: below --
2009-12-15 1:59 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=1260870485.3591.25.camel@odin \
--to=lrg@slimlogic.co.uk \
--cc=balajitk@ti.com \
--cc=eduardo.valentin@nokia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rnayak@ti.com \
--cc=sameo@linux.intel.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox