Merge commit 'v2.6.31-rc8' into x86/txt

Conflicts:
	arch/x86/kernel/reboot.c
	security/Kconfig

Merge reason: resolve the conflicts, bump up from rc3 to rc8.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/reboot.c
index 18ce5c0,a06e8d1..27349f9
--- 1/arch/x86/kernel/reboot.c
--- 2/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@@ -3,7 -3,7 +3,8 @@@
  #include <linux/init.h>
  #include <linux/pm.h>
  #include <linux/efi.h>
+ #include <linux/dmi.h>
 +#include <linux/tboot.h>
  #include <acpi/reboot.h>
  #include <asm/io.h>
  #include <asm/apic.h>

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc drivers/pci/intel-iommu.c
Simple merge

diff --cc security/Kconfig
index 5721847,4c86534..fb363cd
--- 1/security/Kconfig
--- 2/security/Kconfig
+++ b/security/Kconfig
@@@ -113,36 -113,22 +113,52 @@@ config SECURITY_ROOTPLU
  
          If you are unsure how to answer this question, answer N.
  
 +config INTEL_TXT
 +      bool "Enable Intel(R) Trusted Execution Technology (Intel(R) TXT)"
 +      depends on HAVE_INTEL_TXT
 +      help
 +        This option enables support for booting the kernel with the
 +        Trusted Boot (tboot) module. This will utilize
 +        Intel(R) Trusted Execution Technology to perform a measured launch
 +        of the kernel. If the system does not support Intel(R) TXT, this
 +        will have no effect.
 +
 +        Intel TXT will provide higher assurance of system configuration and
 +        initial state as well as data reset protection.  This is used to
 +        create a robust initial kernel measurement and verification, which
 +        helps to ensure that kernel security mechanisms are functioning
 +        correctly. This level of protection requires a root of trust outside
 +        of the kernel itself.
 +
 +        Intel TXT also helps solve real end user concerns about having
 +        confidence that their hardware is running the VMM or kernel that
 +        it was configured with, especially since they may be responsible for
 +        providing such assurances to VMs and services running on it.
 +
 +        See <http://www.intel.com/technology/security/> for more information
 +        about Intel(R) TXT.
 +        See <http://tboot.sourceforge.net> for more information about tboot.
 +        See Documentation/intel_txt.txt for a description of how to enable
 +        Intel TXT support in a kernel boot.
 +
 +        If you are unsure as to whether this is required, answer N.
 +
+ config LSM_MMAP_MIN_ADDR
+       int "Low address space for LSM to protect from user allocation"
+       depends on SECURITY && SECURITY_SELINUX
+       default 65536
+       help
+         This is the portion of low virtual memory which should be protected
+         from userspace allocation.  Keeping a user from writing to low pages
+         can help reduce the impact of kernel NULL pointer bugs.
+ 
+         For most ia64, ppc64 and x86 users with lots of address space
+         a value of 65536 is reasonable and should cause no problems.
+         On arm and other archs it should not be higher than 32768.
+         Programs which use vm86 functionality or have some need to map
+         this low address space will need the permission specific to the
+         systems running LSM.
+ 
  source security/selinux/Kconfig
  source security/smack/Kconfig
  source security/tomoyo/Kconfig