linux-kernel - linux-next: manual merge of the tip tree with the jdelvare-hwmon 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: <20120625150130.5fd1716cabf02aed85918c20@canb.auug.org.au>
Date:	Mon, 25 Jun 2012 15:01:30 +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,
	Jan Beulich <JBeulich@...e.com>,
	Jean Delvare <khali@...ux-fr.org>
Subject: linux-next: manual merge of the tip tree with the jdelvare-hwmon
 tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/hwmon/coretemp.c between commit 3c1aae21b09d ("hwmon: struct
x86_cpu_id arrays can be __initconst") from the jdelvare-hwmon tree and
commit 3bac8715443f ("x86, cpufeature: Rename X86_FEATURE_DTS to
X86_FEATURE_DTHERM") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.

P.S. that tip tree commit has no Signed-off-by line at all :-(
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/hwmon/coretemp.c
index b405781,637c51c..0000000
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@@ -793,8 -793,8 +793,8 @@@ static struct notifier_block coretemp_c
  	.notifier_call = coretemp_cpu_callback,
  };
  
 -static const struct x86_cpu_id coretemp_ids[] = {
 +static const struct x86_cpu_id __initconst coretemp_ids[] = {
- 	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTS },
+ 	{ X86_VENDOR_INTEL, X86_FAMILY_ANY, X86_MODEL_ANY, X86_FEATURE_DTHERM },
  	{}
  };
  MODULE_DEVICE_TABLE(x86cpu, coretemp_ids);

Content of type "application/pgp-signature" skipped