* linux-next: manual merge of the tip tree with the jdelvare-hwmon tree
@ 2012-06-25 5:01 Stephen Rothwell
2012-06-25 5:25 ` H. Peter Anvin
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2012-06-25 5:01 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Jan Beulich, Jean Delvare
[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]
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@canb•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);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the tip tree with the jdelvare-hwmon tree
2012-06-25 5:01 linux-next: manual merge of the tip tree with the jdelvare-hwmon tree Stephen Rothwell
@ 2012-06-25 5:25 ` H. Peter Anvin
0 siblings, 0 replies; 2+ messages in thread
From: H. Peter Anvin @ 2012-06-25 5:25 UTC (permalink / raw)
To: Stephen Rothwell, Thomas Gleixner, Ingo Molnar, Peter Zijlstra
Cc: linux-next, linux-kernel, Jan Beulich, Jean Delvare
Yes, I know... a mistake on my part.
Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>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@canb•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);
--
Sent from my mobile phone. Please excuse brevity and lack of formatting.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-25 5:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-25 5:01 linux-next: manual merge of the tip tree with the jdelvare-hwmon tree Stephen Rothwell
2012-06-25 5:25 ` H. Peter Anvin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox