From: Len Brown <lenb@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Mike Travis <travis@sgi.com>
Subject: Re: linux-next: acpi/cpus4096 merge conflict
Date: Thu, 12 Jun 2008 00:46:15 -0400 (EDT) [thread overview]
Message-ID: <alpine.LFD.1.10.0806120045320.12191@localhost.localdomain> (raw)
In-Reply-To: <20080612135032.b5d0c684.sfr@canb.auug.org.au>
On Thu, 12 Jun 2008, Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a trivial conflict in
> drivers/acpi/processor_throttling.c between commit
> 141ad0688adb53094d6f75b39b4b3b0625de0e07 ("acpi: use performance variant
> for_each_cpu_mask_nr") from the cpus4096 tree and commit
> 08a4ab4a5fd58438840524ce22199c6bbd05816f ("ACPI: change processors from
> array to per_cpu variable") from the acpi tree.
>
> It is just a context conflict and I did the obvious fixup.
thanks.
it would be ideal if the cpus4096 tree didn't scribble on drivers/acpi --
though I don't know if partitioning those patches is practical.
-Len
next prev parent reply other threads:[~2008-06-12 4:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-12 3:50 linux-next: acpi/cpus4096 merge conflict Stephen Rothwell
2008-06-12 4:46 ` Len Brown [this message]
2008-06-12 12:18 ` Ingo Molnar
2008-06-12 15:25 ` Stephen Rothwell
2008-06-12 18:31 ` Mike Travis
2008-06-13 7:42 ` 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=alpine.LFD.1.10.0806120045320.12191@localhost.localdomain \
--to=lenb@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--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