- Update to 2.6.31-rc4.

suse-commit: 3fd57d8cbb66f506d72f52a9563970a762da1c85

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
index b6d8fd7,063d738..3283c8c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -343,14 -343,10 +343,15 @@@ KBUILD_CPPFLAGS := -D__KERNEL_
  KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
                   -fno-strict-aliasing -fno-common \
                   -Werror-implicit-function-declaration \
-                  -Wno-format-security
+                  -Wno-format-security \
+                  -fno-delete-null-pointer-checks
  KBUILD_AFLAGS   := -D__ASSEMBLY__
  
 +# Warn about unsupported modules in kernels built inside Autobuild
 +ifneq ($(wildcard /.buildenv),)
 +CFLAGS                += -DUNSUPPORTED_MODULES=2
 +endif
 +
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/char/n_tty.c
Simple merge

diff --cc drivers/char/vt.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

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

diff --cc drivers/net/ibm_newemac/rgmii.c
Simple merge

diff --cc drivers/video/Kconfig
Simple merge

diff --cc fs/Kconfig
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
index 4baceea,6ad76bf..63c0c60
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -757,8 -732,10 +734,30 @@@
                INIT_RAM_FS                                             \
        }
  
- #define BSS_SECTION(sbss_align, bss_align)                            \
-       SBSS                                                            \
+ #define BSS_SECTION(sbss_align, bss_align, stop_align)                        \
+       . = ALIGN(sbss_align);                                          \
+       VMLINUX_SYMBOL(__bss_start) = .;                                \
+       SBSS(sbss_align)                                                \
        BSS(bss_align)                                                  \
-       . = ALIGN(4);
+       . = ALIGN(stop_align);                                          \
+       VMLINUX_SYMBOL(__bss_stop) = .;
 +
++#ifdef CONFIG_STACK_UNWIND
++#define EH_FRAME                                                      \
++              /* Unwind data binary search table */                   \
++              . = ALIGN(8);                                           \
++              .eh_frame_hdr : AT(ADDR(.eh_frame_hdr) - LOAD_OFFSET) { \
++                      VMLINUX_SYMBOL(__start_unwind_hdr) = .;         \
++                      *(.eh_frame_hdr)                                \
++                      VMLINUX_SYMBOL(__end_unwind_hdr) = .;           \
++              }                                                       \
++              /* Unwind data */                                       \
++              . = ALIGN(8);                                           \
++              .eh_frame : AT(ADDR(.eh_frame) - LOAD_OFFSET) {         \
++                      VMLINUX_SYMBOL(__start_unwind) = .;             \
++                      *(.eh_frame)                                    \
++                      VMLINUX_SYMBOL(__end_unwind) = .;               \
++              }
++#else
++#define EH_FRAME
++#endif

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

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

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched.c
Simple merge