linux-kernel - linux-next: manual merge of the acpi tree with 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: <20130211125912.2543dcc111b7b67dca8b2e05@canb.auug.org.au>
Date:	Mon, 11 Feb 2013 12:59:12 +1100
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,
	Paul Gortmaker <paul.gortmaker@...driver.com>,
	"Rafael J. Wysocki" <rjw@...k.pl>
Subject: linux-next: manual merge of the acpi tree with the pm tree

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/x86/kernel/process.c between commit 43720bd60143 ("PM / tracing:
remove deprecated power trace API") from the pm tree and commit
69fb3676df33 ("x86 idle: remove mwait_idle() and "idle=mwait" cmdline
param") from the acpi tree.

I fixed it up (the latter removed the function modified by the former, so
I did that) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped