Subject: Re: linux-next: manual merge of the acpi tree

From: Ingo Molnar <[email-masked]>
Date: Mon, 23 Jun 2008 23:56:07 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi Len,
> 
> Today's linux-next merge of the acpi tree got a conflict in
> arch/x86/kernel/process.c between commit
> 8750bf598db6a0ea3475d1cf8da922b325941e12 ("x86: add C1E aware idle
> function") from the x86 tree and commits
> bd08eac673842bab79ddaec048012b6e5d4074fd ("ACPI: Create "idle=halt" boot
> parameter") and 5ffc8862cc917ae5107049f3c5fd549fb6c19cac ("ACPI : Create
> "idle=nomwait" bootparam") from the acpi tree.
> 
> This is just an overlapping additions problem, so I took both in the 
> obvious manner.

thanks Stephen. I've cherry-picked the two ACPI commits into 
tip/x86/cpu, to make future merges easier.

	Ingo