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 [email protected]
pgpf1qMebu6Ou.pgp
Description: PGP signature
