linux-kernel - linux-next: manual merge of the tip tree with the cpufreq 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: <20100727141413.2c67e158.sfr@canb.auug.org.au>
Date:	Tue, 27 Jul 2010 14:14:13 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thomas Renninger <trenn@...e.de>, Dave Jones <davej@...hat.com>
Subject: linux-next: manual merge of the tip tree with the cpufreq tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/cpufreq/cpufreq.c between commit
1f247ccc157ce29b4cd1e1b9cbe3cce8f24522bf ("[CPUFREQ] x86 cpufreq: Make
trace_power_frequency cpufreq driver independent") from the cpufreq tree
and commit 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb ("x86 cpufreq, perf:
Make trace_power_frequency cpufreq driver independent") from the tip tree.

Slightly different versions of the same patch.  I used the cpufreq tree
version of this file (it has an added dprintk() and fixed whitespace).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped