From: Mark Brown <broonie@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Liam Girdwood <lgirdwood@gmail•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm•com>,
"Rafael J. Wysocki" <rjw@sisk•pl>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Subject: Re: linux-next: manual merge of the regulator tree with the pm tree
Date: Tue, 27 Aug 2013 22:10:46 +0100 [thread overview]
Message-ID: <20130827211046.GE10783@sirena.org.uk> (raw)
In-Reply-To: <20130827153754.a28ce27a424e4cbeab503079@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
On Tue, Aug 27, 2013 at 03:37:54PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the regulator tree got a conflict in
> drivers/cpufreq/cpufreq-cpu0.c between commit f837a9b5ab05 ("cpufreq:
> cpufreq-cpu0: remove device tree parsing for cpu nodes") from the tree
> and commit 7d748971c0c0 ("cpufreq: cpufreq-cpu0: Use
> devm_regulator_get_optional()") from the regulator tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The resolution looks good to me.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-08-27 21:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 5:37 linux-next: manual merge of the regulator tree with the pm tree Stephen Rothwell
2013-08-27 21:10 ` Mark Brown [this message]
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=20130827211046.GE10783@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=lgirdwood@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=rjw@sisk$(echo .)pl \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sudeep.karkadanagesha@arm$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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