From: "H. Peter Anvin" <hpa@zytor•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Jan Beulich <JBeulich@suse•com>,
Jean Delvare <khali@linux-fr•org>
Subject: Re: linux-next: manual merge of the tip tree with the jdelvare-hwmon tree
Date: Sun, 24 Jun 2012 22:25:06 -0700 [thread overview]
Message-ID: <f145453b-37d5-4116-bf75-001ea408b461@email.android.com> (raw)
In-Reply-To: <20120625150130.5fd1716cabf02aed85918c20@canb.auug.org.au>
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.
prev parent reply other threads:[~2012-06-25 5:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f145453b-37d5-4116-bf75-001ea408b461@email.android.com \
--to=hpa@zytor$(echo .)com \
--cc=JBeulich@suse$(echo .)com \
--cc=khali@linux-fr$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox