Linus,
Please pull the latest x86-fixes-for-linus git tree from:
   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
this fixes the arch/x86/Kconfig defaults and a few other fixlets.
Thanks,
	Ingo
------------------>

H. Peter Anvin (2):

      x86, suspend, acpi: enter Big Real Mode

      x86, suspend, acpi: correct and add comments about Big Real Mode
Kevin Winchester (1):

      x86: Fix compile error with CONFIG_AS_CFI=n
Thomas Gleixner (2):

      x86: sanitize Kconfig

      Documentation: document debugpat commandline option
 Documentation/kernel-parameters.txt |    2 ++

 arch/x86/Kconfig                    |   22 +++++++++-------------

 arch/x86/kernel/acpi/sleep.c        |   30 ++++++++++++++++++++++++------

 include/asm-x86/dwarf2.h            |   30 +++++++++++++++---------------

 4 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index b3a5aad..681d615 100644

--- a/Documentation/kernel-parameters.txt

+++ b/Documentation/kernel-parameters.txt

@@ -571,6 +571,8 @@ and is between 256 and 4096 characters. It is defined in the file
 	debug_objects	[KNL] Enable object debugging
+	debugpat	[X86] Enable PAT debugging

+

 	decnet.addr=	[HW,NET]

 			Format: <area>[,<node>]

 			See also Documentation/networking/decnet.txt.

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

index 6958d6b..2642b4b 100644

--- a/arch/x86/Kconfig

+++ b/arch/x86/Kconfig

@@ -447,7 +447,6 @@ config PARAVIRT_DEBUG

 config MEMTEST

 	bool "Memtest"

 	depends on X86_64

-	default y

 	help

 	  This option adds a kernel parameter 'memtest', which allows memtest

 	  to be set.

@@ -455,7 +454,7 @@ config MEMTEST

 		memtest=1, mean do 1 test pattern;

 		...

 		memtest=4, mean do 4 test patterns.

-	  If you are unsure how to answer this question, answer Y.

+	  If you are unsure how to answer this question, answer N.
 config X86_SUMMIT_NUMA...
[ message continues ]

hm, you just pushed another fix for that out via:
| commit 4d3702b62e004172f44870763cf56793d8de0cbf

| Author: Roland Dreier <rdreier@cisco.com>

| Date:   Mon Jul 14 18:11:23 2008 -0700

|

|     x86: Rename "ignore" macro in <asm/dwarf2.h> to avoid collision
that would collide. Here's a (separate) merged up tree that will pull

cleanly:
   git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus-2
(but i have not touched the other branch either.)
Thanks,
	Ingo
------------------>

H. Peter Anvin (2):

      x86, suspend, acpi: enter Big Real Mode

      x86, suspend, acpi: correct and add comments about Big Real Mode
Kevin Winchester (1):

      x86: Fix compile error with CONFIG_AS_CFI=n
Thomas Gleixner (2):

      x86: sanitize Kconfig

      Documentation: document debugpat commandline option
 Documentation/kernel-parameters.txt |    2 ++

 arch/x86/Kconfig                    |   22 +++++++++-------------

 arch/x86/kernel/acpi/sleep.c        |   30 ++++++++++++++++++++++++------

 3 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt

index b3a5aad..681d615 100644

--- a/Documentation/kernel-parameters.txt

+++ b/Documentation/kernel-parameters.txt

@@ -571,6 +571,8 @@ and is between 256 and 4096 characters. It is defined in the file
 	debug_objects	[KNL] Enable object debugging
+	debugpat	[X86] Enable PAT debugging

+

 	decnet.addr=	[HW,NET]

 			Format: <area>[,<node>]

 			See also Documentation/networking/decnet.txt.

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig

index 6958d6b..2642b4b 100644

--- a/arch/x86/Kconfig

+++ b/arch/x86/Kconfig

@@ -447,7 +447,6 @@ config PARAVIRT_DEBUG

 config MEMTEST

 	bool "Memtest"

 	depends on X86_64

-	default y

 	help

 	  This option adds a kernel parameter 'memtest', which allows memtest

 	  to be set.

@@ -455,7 +454,7 @@ config MEMTEST

 		memtest=1, mean do 1 test pa...
[ message continues ]

Heh, I just merged it myself - it happens all the time, I did't even think

about it.
If it had been any more complex I would have emailed you (and hopefully

noticed this follow-up email before doing that), but it was rather obvious

enough, and I just picked your side.
		Linus

--