linux-kernel - linux-next: manual merge of the acpi 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>] [day] [month] [year] [list]

Message-Id: <20100512112117.8492aa72.sfr@canb.auug.org.au>
Date:	Wed, 12 May 2010 11:21:17 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Len Brown <lenb@...nel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alex Chiang <achiang@...onical.com>
Subject: linux-next: manual merge of the acpi tree with Linus' tree

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
drivers/acpi/sleep.c between commit
7d6fb7bd1919517937ec390f6ca2d7bcf4f89fb6 ("ACPI: sleep: eliminate
duplicate entries in acpisleep_dmi_table[]") from Linus' tree and commit
7e962fbadef538365228962b9dd869f95d745dd5 ("ACPI: delete DMI blacklist for
sci_en_on_resume") from the acpi tree.

I fixed it up and can carry the fix for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped