From: Dave Jones <davej@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Ingo Molnar <mingo@elte.hu>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: linux-next: manual merge of the cpufreq tree with the cpus4096 tree
Date: Tue, 20 Jan 2009 00:25:54 -0500 [thread overview]
Message-ID: <20090120052554.GA31797@redhat.com> (raw)
In-Reply-To: <20090120134713.1fd5fd3a.sfr@canb.auug.org.au>
On Tue, Jan 20, 2009 at 01:47:13PM +1100, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the cpufreq tree got a conflict in
> arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between commit
> 5cd7376200be7b8bab085557ff5876b04bd84191 ("fix: crash: IP:
> __bitmap_intersects+0x48/0x73") from the cpus4096 tree and commit
> 6fc619dc092a0a159cf5fb46afa52f2f8128b1d4 ("[CPUFREQ] checkpatch cleanups
> for acpi-cpufreq") from the cpufreq tree.
>
> Just changing context. I fixed it up (see below) and can carry the fix
> as necessary.
Yep, looks sane.
I can't wait for this cpumask stuff to be over with, it's been a
pain in the ass for merge collisions.
Dave
--
http://www.codemonkey.org.uk
next prev parent reply other threads:[~2009-01-20 5:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 2:47 linux-next: manual merge of the cpufreq tree with the cpus4096 tree Stephen Rothwell
2009-01-20 5:25 ` Dave Jones [this message]
2009-01-20 8:21 ` Ingo Molnar
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=20090120052554.GA31797@redhat.com \
--to=davej@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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).