- Update to 2.6.31-rc7.

  - Eliminated 3 patches.

suse-commit: 3b5998764fef713f5851ce4940a3eac882bc8530

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
index e2ced3d,0121304..0dcb2e8
--- 1/arch/x86/kernel/cpu/mcheck/mce.c
--- 2/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@@ -1235,11 -1226,15 +1235,16 @@@ static void mce_init(void
  }
  
  /* Add per CPU specific workarounds here */
- static void mce_cpu_quirks(struct cpuinfo_x86 *c)
+ static int mce_cpu_quirks(struct cpuinfo_x86 *c)
  {
+       if (c->x86_vendor == X86_VENDOR_UNKNOWN) {
+               pr_info("MCE: unknown CPU type - not enabling MCE support.\n");
+               return -EOPNOTSUPP;
+       }
+ 
        /* This should be disabled by the BIOS, but isn't always */
        if (c->x86_vendor == X86_VENDOR_AMD) {
 +#ifndef CONFIG_XEN
                if (c->x86 == 15 && banks > 4) {
                        /*
                         * disable GART TBL walk error reporting, which

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

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/media/video/uvc/uvc_driver.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/tulip/tulip_core.c
Simple merge

diff --cc drivers/net/ucc_geth.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/main.c
index aa2a845,2d9d6bd..5454f04
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -611,9 -584,8 +611,9 @@@ asmlinkage void __init start_kernel(voi
        setup_arch(&command_line);
        mm_init_owner(&init_mm, &init_task);
        setup_command_line(command_line);
 +      unwind_setup();
-       setup_per_cpu_areas();
        setup_nr_cpu_ids();
+       setup_per_cpu_areas();
        smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
  
        build_all_zonelists();

diff --cc kernel/irq/manage.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/mmap.c
index 6b6e92b,8101de4..3918ad2
--- 1/mm/mmap.c
--- 2/mm/mmap.c
+++ b/mm/mmap.c
@@@ -87,11 -87,7 +87,8 @@@ int sysctl_overcommit_memory = OVERCOMM
  int sysctl_overcommit_ratio = 50;     /* default is 50% */
  int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
  struct percpu_counter vm_committed_as;
 +int heap_stack_gap __read_mostly = 1;
  
- /* amount of vm to protect from userspace access */
- unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
- 
  /*
   * Check that a process has enough memory to allocate a new virtual
   * mapping. 0 means there is enough memory for the allocation to

diff --cc mm/page_alloc.c
Simple merge

diff --cc security/Kconfig
Simple merge

diff --cc security/Makefile
index 00c29da,b56e7f9..bdf96b1
--- 1/security/Makefile
--- 2/security/Makefile
+++ b/security/Makefile
@@@ -6,10 -6,9 +6,10 @@@ obj-$(CONFIG_KEYS)                     += keys
  subdir-$(CONFIG_SECURITY_SELINUX)     += selinux
  subdir-$(CONFIG_SECURITY_SMACK)               += smack
  subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
 +subdir-$(CONFIG_SECURITY_APPARMOR)        += apparmor
  
  # always enable default capabilities
- obj-y         += commoncap.o
+ obj-y         += commoncap.o min_addr.o
  
  # Object file lists
  obj-$(CONFIG_SECURITY)                        += security.o capability.o