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, Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
Zhao Yakui <yakui.zhao@intel•com>,
Li Shaohua <shaohua.li@intel•com>
Subject: Re: linux-next: manual merge of the acpi tree
Date: Mon, 30 Jun 2008 11:03:56 +0200 [thread overview]
Message-ID: <20080630090356.GB1701@elte.hu> (raw)
In-Reply-To: <20080630160958.ed96d469.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> On Mon, 30 Jun 2008 15:59:12 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 <mingo@elte•hu>
Date: Mon Jun 30 11:00:59 2008 +0200
doc: Documentation/kernel-parameters.txt, fix whitespace
based on:
| commit ce4bd94fad0fa934c0de1ba1932e7e61bc142176
| Author: Zhao Yakui <yakui.zhao@intel•com>
| Date: Fri Jun 20 03:44:11 2008 -0400
|
| ACPI : Create "idle=nomwait" bootparam
Signed-off-by: Ingo Molnar <mingo@elte•hu>
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
next prev parent reply other threads:[~2008-06-30 9:04 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-30 5:59 linux-next: manual merge of the acpi tree Stephen Rothwell
2008-06-30 6:09 ` Stephen Rothwell
2008-06-30 9:03 ` Ingo Molnar [this message]
-- 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-27 3:14 Stephen Rothwell
2008-06-26 4:21 Stephen Rothwell
2008-06-25 4:20 Stephen Rothwell
2008-06-25 7:15 ` Ingo Molnar
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
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=20080630090356.GB1701@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=hpa@zytor$(echo .)com \
--cc=lenb@kernel$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=shaohua.li@intel$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=yakui.zhao@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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