linux-kernel - linux-next: manual merge of the cpuidle tree with Linus' tree and the pm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130402121511.40119d4e1e2e8fae62c047ec@canb.auug.org.au>
Date:	Tue, 2 Apr 2013 12:15:11 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the cpuidle tree with Linus' tree and
 the pm tree

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped