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

From: Ingo Molnar <[email-masked]>
Date: Mon, 30 Jun 2008 11:03:56 +0200

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

> On Mon, 30 Jun 2008 15:59:12 +1000 Stephen Rothwell <[email-masked]> wrote:
> >
> > Hi Len, Ingo,
> > 
> > Today's linux-next merge of the acpi tree got a conflict in 
> > Documentation/kernel-parameters.txt between commits "ACPI : Create 
> > "idle=nomwait" bootparam" and "ACPI: Create "idle=halt" bootparam" 
> > different version of which appear in the x86 and acpi trees ("ACPI : 
> > Create "idle=nomwait" bootparam" in the acpi tree is different from 
> > the version that was in that tree on Friday (thus this conflict 
> > comes up again)).
> > 
> > Please sort this out ...
> 
> This also caused conflicts in arch/ia64/kernel/process.c,
> arch/x86/kernel/process.c, drivers/acpi/processor_core.c,
> include/asm-ia64/processor.h and include/asm-x86/processor.h.
> 
> I fixed it up by using the acpi tree's versions.

hm, this was caused by the ACPI tree doing a non-append rebase instead 
of the trivial delta fix like the one below. I've added the one below to 
the x86 tree.

	Ingo

----------------->
commit 4fb0b0af57439fa62cf24a39b65f6b6ba148fba6
Author: Ingo Molnar <[email-masked]>
Date:   Mon Jun 30 11:00:59 2008 +0200

    doc: Documentation/kernel-parameters.txt, fix whitespace
    
    based on:
    
    | commit ce4bd94fad0fa934c0de1ba1932e7e61bc142176
    | Author: Zhao Yakui <[email-masked]>
    | Date:   Fri Jun 20 03:44:11 2008 -0400
    |
    |     ACPI : Create "idle=nomwait" bootparam
    
    Signed-off-by: Ingo Molnar <[email-masked]>

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 39baaba..0f7268a 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -785,7 +785,7 @@ and is between 256 and 4096 characters. It is defined in the file
 			See Documentation/ide/ide.txt.
 
 	idle=		[X86]
-			Format: idle=poll or idle=mwait, idle = halt, idle=nomwait
+			Format: idle=poll or idle=mwait, idle=halt, idle=nomwait
 			Poll forces a polling idle loop that can slightly improves the performance
 			of waking up a idle CPU, but will use a lot of power and make the system
 			run hot. Not recommended.
@@ -793,9 +793,9 @@ and is between 256 and 4096 characters. It is defined in the file
 			to not use it because it doesn't save as much power as a normal idle
 			loop use the MONITOR/MWAIT idle loop anyways. Performance should be the same
 			as idle=poll.
-			idle = halt . Halt is forced to be used for CPU idle.
+			idle=halt . Halt is forced to be used for CPU idle.
 			In such case C2/C3 won't be used again.
-			idle = nomwait. disable Mwait for CPU C-state.
+			idle=nomwait. disable Mwait for CPU C-state.
 			In such case C2C3_FFH access mode will be disabled.
 
 	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem