From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
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,
viresh kumar <viresh.kumar@linaro.org>,
Magnus Damm <damm+renesas@opensource.se>,
Simon Horman <horms+renesas@verge.net.au>
Subject: linux-next: manual merge of the pm tree with the arm-soc tree
Date: Wed, 10 Sep 2014 14:18:50 +1000 [thread overview]
Message-ID: <20140910141850.34c07f72@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 542 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-shmobile/setup-sh73a0.c between commit aa0bdc303b0f
("ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits") from the
arm-soc tree and commit 978027e170fb ("cpufreq: cpu0: rename driver and
internals to 'cpufreq_dt'") from the pm tree.
I fixed it up (the former removed the lines that were updated by the
latter) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-10 4:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 4:18 Stephen Rothwell [this message]
2014-09-10 23:29 ` linux-next: manual merge of the pm tree with the arm-soc tree Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2020-10-21 0:00 Stephen Rothwell
2017-04-21 0:54 Stephen Rothwell
2017-04-21 5:53 ` Arnd Bergmann
2017-04-21 6:39 ` santosh.shilimkar
2017-04-21 9:31 ` Arnd Bergmann
2017-04-21 21:02 ` santosh.shilimkar
2017-04-21 21:31 ` Rafael J. Wysocki
2017-04-21 21:50 ` Santosh Shilimkar
2017-04-21 21:44 ` Arnd Bergmann
2017-04-21 21:54 ` Santosh Shilimkar
2017-04-24 18:02 ` Dave Gerlach
2017-04-24 18:22 ` Santosh Shilimkar
2017-04-21 0:50 Stephen Rothwell
2017-04-20 0:34 Stephen Rothwell
2017-04-20 0:38 ` Rafael J. Wysocki
2016-04-29 1:18 Stephen Rothwell
2014-09-10 4:14 Stephen Rothwell
2014-07-30 2:23 Stephen Rothwell
2014-07-30 12:55 ` Rafael J. Wysocki
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=20140910141850.34c07f72@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=damm+renesas@opensource.se \
--cc=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=rjw@rjwysocki.net \
--cc=viresh.kumar@linaro.org \
/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).