From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Len Brown <lenb@kernel.org>,
linux-next@vger.kernel.org, Bob Moore <robert.moore@intel.com>,
Yinghai Lu <yhlu.kernel@gmail.com>
Subject: Re: linux-next: manual merge of the acpi tree
Date: Wed, 25 Jun 2008 09:15:08 +0200 [thread overview]
Message-ID: <20080625071508.GA20454@elte.hu> (raw)
In-Reply-To: <20080625142034.59b343c7.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Len,
>
> Today's linux-next merge of the acpi tree got a conflict in
> arch/x86/kernel/srat_32.c between commit
> 9920a004626a2dc2980693d634e4000f086cb283 ("x86: use acpi_numa_init to
> parse on 32-bit numa") from the tree and commit
> a27557c76c6e092ec886f0e3e443f3190f0b0fcc ("ACPICA: Eliminate
> acpi_native_uint type") from the acpi tree.
>
> The code modified by the latter was removed by the former. So I used
> the former.
thanks Stephen.
I suspect we cannot really eliminate this particular conflict because
the latter change is a (much welcome!) infrastructure cleanup in all
things ACPI, the former is an early init refactoring/cleanup that
depends on a whole lot of other (non-ACPI) changes in tip/x86/*. It's
too late in .26-rc cycle to push the infrastructure cleanup upstream, so
i suspect we have to live with this conflict for a while.
Ingo
next prev parent reply other threads:[~2008-06-25 7:15 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-25 4:20 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-06-25 7:15 ` Ingo Molnar [this message]
2008-06-25 15:59 ` Stephen Rothwell
2008-06-25 16:29 ` Ingo Molnar
2008-06-25 19:18 ` Len Brown
2008-06-25 19:57 ` Ingo Molnar
2008-06-26 22:42 ` Len Brown
2008-06-27 7:17 ` Ingo Molnar
2008-06-25 14:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-01 2:10 Stephen Rothwell
2008-12-01 2:55 ` Len Brown
2008-12-01 3:02 ` Stephen Rothwell
2008-12-01 4:11 ` Len Brown
2008-12-01 4:37 ` Stephen Rothwell
2008-10-21 2:55 Stephen Rothwell
2008-10-20 4:45 Stephen Rothwell
2008-10-15 4:23 Stephen Rothwell
2008-10-15 16:10 ` Bjorn Helgaas
2008-10-15 4:14 Stephen Rothwell
2008-08-25 5:48 Stephen Rothwell
2008-07-17 4:22 Stephen Rothwell
2008-07-17 7:24 ` Adrian Bunk
2008-07-18 0:37 ` Stephen Rothwell
2008-07-17 4:05 Stephen Rothwell
2008-07-17 4:00 Stephen Rothwell
2008-07-17 4:29 ` Stephen Rothwell
2008-07-16 5:33 Stephen Rothwell
2008-07-16 5:35 ` Harvey Harrison
2008-07-09 3:13 Stephen Rothwell
2008-07-08 3:03 Stephen Rothwell
2008-07-08 8:18 ` Stephen Rothwell
2008-07-08 2:59 Stephen Rothwell
2008-07-08 14:33 ` Rafael J. Wysocki
2008-06-30 5:59 Stephen Rothwell
2008-06-30 6:09 ` Stephen Rothwell
2008-06-30 9:03 ` Ingo Molnar
2008-06-27 3:14 Stephen Rothwell
2008-06-26 4:21 Stephen Rothwell
2008-06-25 4:13 Stephen Rothwell
2008-06-23 4:19 Stephen Rothwell
2008-06-23 21:56 ` Ingo Molnar
2008-06-16 4:03 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=20080625071508.GA20454@elte.hu \
--to=mingo@elte.hu \
--cc=lenb@kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=robert.moore@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=yhlu.kernel@gmail.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).