linux-kernel - linux-next: manual merge of the pm tree with Linus' 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20120518154800.3b8cae2960234e03bee0101e@canb.auug.org.au>
Date:	Fri, 18 May 2012 15:48:00 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Aaron Lu <aaron.lu@....com>
Subject: linux-next: manual merge of the pm tree with Linus' tree

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
drivers/acpi/scan.c between commit 5c7dd710f691 ("ACPI / PCI / PM: Fix
device PM regression related to D3hot/D3cold") from the  tree and commit
6ef564fd2070 ("ACPI / PM: Evaluate _PS3 when entering D3 Cold") from the
pm tree.

I fixed it up (by using the version from Linus' tree) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped