From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dave Jones <davej@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Naga Chumbalkar <nagananda.chumbalkar@hp•com>,
Alex Chiang <achiang@hp•com>, Len Brown <len.brown@intel•com>
Subject: linux-next: manual merge of the cpufreq tree with the acpi tree
Date: Wed, 24 Feb 2010 14:34:08 +1100 [thread overview]
Message-ID: <20100224143408.69e0c889.sfr@canb.auug.org.au> (raw)
Hi Dave,
Today's linux-next merge of the cpufreq tree got a conflict in
drivers/acpi/processor_core.c between commit
5f45c35d7ede1c00cbaa3b09b8a84c425af81c4b ("ACPI: processor: mv
processor_core.c processor_driver.c") from the acpi tree and commit
0f1d683fb35d6c6f49ef696c95757f3970682a0e ("[CPUFREQ] Processor Clocking
Control interface driver") from the cpufreq tree.
I applied the equivalent patch to processor_driver.c (see below) and can
carry this as necessary.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 24 Feb 2010 14:29:12 +1100
Subject: [PATCH] cpufreq: merge fixup for processor_core.c rename
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/acpi/processor_driver.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 7e8e1ba..b5658cd 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -123,6 +123,8 @@ static const struct file_operations acpi_processor_info_fops = {
#endif
DEFINE_PER_CPU(struct acpi_processor *, processors);
+EXPORT_PER_CPU_SYMBOL(processors);
+
struct acpi_processor_errata errata __read_mostly;
/* --------------------------------------------------------------------------
--
1.7.0
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
next reply other threads:[~2010-02-24 3:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-24 3:34 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-11-12 2:45 linux-next: manual merge of the cpufreq tree with the acpi tree Stephen Rothwell
2009-11-12 12:15 ` Thomas Renninger
2009-11-12 17:13 ` Dave Jones
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=20100224143408.69e0c889.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=achiang@hp$(echo .)com \
--cc=davej@redhat$(echo .)com \
--cc=len.brown@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nagananda.chumbalkar@hp$(echo .)com \
/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