From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk.pl>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>,
linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>,
linux-next@vger.kernel.org, Ian Munsie <imunsie@au1.ibm.com>,
Grant Likely <grant.likely@linaro.org>,
linuxppc-dev@lists.ozlabs.org
Subject: linux-next: manual merge of the pm tree with the powerpc tree
Date: Tue, 27 Aug 2013 13:05:07 +1000 [thread overview]
Message-ID: <20130827130507.27bd4ceda462db1751bfc30d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
arch/powerpc/kernel/prom.c between commit dc0e643afc50 ("powerpc: Make
prom.c device tree accesses endian safe") from the powerpc tree and
commits 819d596568d8 ("powerpc: refactor of_get_cpu_node to support other
architectures") and 183912d352a2 ("of: move of_get_cpu_node
implementation to DT core library") from the pm tree.
I think that the latter superceded the conflicting fixes in the former,
so I just used the latter and can carry the fix as necessary (no action
is required).
P.S. Rafael, I used both your addresses because I have had a bounce from
the sisk.pl one in the past ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2013-08-27 3:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20130827130507.27bd4ceda462db1751bfc30d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=grant.likely@linaro.org \
--cc=imunsie@au1.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rjw@sisk.pl \
--cc=rob.herring@calxeda.com \
--cc=sudeep.karkadanagesha@arm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox