* linux-next: manual merge of the cpuidle tree with Linus' tree and the pm tree
@ 2013-04-02 1:15 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-04-02 1:15 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: linux-next, linux-kernel, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 874 bytes --]
Hi Daniel,
Today's linux-next merge of the cpuidle tree got a conflict in
drivers/base/power/qos.c between commit 37530f2bda03 ("PM / QoS: Remove
device PM QoS sysfs attributes at the right place") from Linus' tree,
commit dcc1a5e7d8f7 ("PM / QoS: Avoid possible deadlock related to sysfs
access") from the pm tree and commit 1e3b5df683e2 ("PM / QoS: Remove
device PM QoS sysfs attributes at the right place") from the cpuidle tree.
The cpuidle tree commit appears to be an earlier version of the commit
from Linus' tree, so I just use the pm tree version of the file and can
carry the fix as necessary (no action is required). I do wonder why this
patch appears in two version in two trees In fact it looks like the
cpuidle tree is nothing more than an old copy of the pm tree :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-02 1:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-02 1:15 linux-next: manual merge of the cpuidle tree with Linus' tree and the pm tree Stephen Rothwell
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).