From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Jones <davej@redhat.com>, Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, Mike Travis <travis@sgi.com>
Subject: linux-next: x86/cpufreq merge conflict
Date: Mon, 19 May 2008 14:39:27 +1000 [thread overview]
Message-ID: <20080519143927.e8b43d39.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 737 bytes --]
Hi Dave, Ingo,
Today's linux-next cpufreq merge got a conflict in
drivers/cpufreq/cpufreq.c between commit
fdbf6c63c1bd250d45a59a6392fa18ccb360837b ("x86: Use performance variant
for_each_cpu_mask_nr") from the x86 tree and commit
ae47c109341198f814767d2f06a1c1e4c7910fb9 ("[CPUFREQ] change cpu freq
arrays to per_cpu variables") from the cpufreq tree. The conflict is
just contextual with the former changing for_each_cpu_mask to
for_each_cpu_mask_nr in a couple of places right next to the latter
changing "cpufreq_cpu_data[j]" to "per_cpu(cpufreq_cpu_data, j)".
I did the obvious fixups but maybe worth a look.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2008-05-19 4:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-19 4:39 Stephen Rothwell [this message]
2008-05-19 22:26 ` linux-next: x86/cpufreq merge conflict Dave Jones
2008-05-20 5:28 ` Stephen Rothwell
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=20080519143927.e8b43d39.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davej@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=travis@sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).