- Update to 2.6.35-rc6.
authorJeff Mahoney <jeffm@suse.de>
Fri, 23 Jul 2010 16:25:37 +0000 (09:25 -0700)
committerJeff Mahoney <jeffm@suse.de>
Fri, 23 Jul 2010 16:28:50 +0000 (09:28 -0700)
suse-commit: 643df99f5dccd3929fa1d882b2c2dc111159cdbf

32 files changed:
1  2 
Documentation/kernel-parameters.txt
MAINTAINERS
Makefile
arch/powerpc/kernel/crash_dump.c
arch/powerpc/kernel/machine_kexec.c
arch/x86/kernel/entry_64.S
arch/x86/kernel/setup_percpu.c
arch/x86/pci/i386.c
drivers/edac/Kconfig
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/ttm/ttm_page_alloc.c
drivers/input/mouse/Kconfig
drivers/input/mouse/synaptics.c
drivers/input/mouse/synaptics.h
drivers/input/serio/i8042-x86ia64io.h
fs/nfs/internal.h
fs/xfs/linux-2.6/xfs_super.c
fs/xfs/quota/xfs_qm.c
fs/xfs/xfs_mount.h
include/linux/fb.h
include/linux/mm.h
include/linux/pci.h
include/net/sock.h
kernel/early_res.c
mm/Kconfig
mm/Makefile
mm/page_alloc.c
mm/vmscan.c
net/core/dev.c
net/ipv4/tcp.c
net/ipv4/tcp_output.c

Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -17,9 -17,8 +17,9 @@@ config MOUSE_PS
        default y
        select SERIO
        select SERIO_LIBPS2
-       select SERIO_I8042 if X86 && !X86_MRST
+       select SERIO_I8042 if X86
        select SERIO_GSCPS2 if GSC
 +      select LEDS_CLASS if MOUSE_PS2_SYNAPICS_LED
        help
          Say Y here if you have a PS/2 mouse connected to your system. This
          includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -259,8 -259,7 +259,8 @@@ typedef struct xfs_mount 
        wait_queue_head_t       m_wait_single_sync_task;
        __int64_t               m_update_flags; /* sb flags we need to update
                                                   on the next remount,rw */
-       struct list_head        m_mplist;       /* inode shrinker mount list */
+       struct shrinker         m_inode_shrink; /* inode reclaim shrinker */
 +      struct vfsmount         *m_vfsmount;
  } xfs_mount_t;
  
  /*
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -319,15 -321,10 +321,17 @@@ void __init free_early(u64 start, u64 e
        struct early_res *r;
        int i;
  
+       kmemleak_free_part(__va(start), end - start);
        i = find_overlapped_early(start, end);
        r = &early_res[i];
 +#ifdef CONFIG_XEN /* Shouldn't it always be this way? */
 +      if (i >= max_early_res || r->end < end || r->start > start)
 +              panic("free_early on not reserved area: %llx-%llx!",
 +                       start, end - 1);
 +
 +      drop_range_partial(i, start, end);
 +#else
        if (i >= max_early_res || r->end != end || r->start != start)
                panic("free_early on not reserved area: %llx-%llx!",
                         start, end - 1);
diff --cc mm/Kconfig
Simple merge
diff --cc mm/Makefile
@@@ -15,11 -15,10 +15,13 @@@ obj-y                      := bootmem.o filemap.o mempool.
                           $(mmu-y)
  obj-y += init-mm.o
  
+ obj-$(CONFIG_HAVE_MEMBLOCK) += memblock.o
  obj-$(CONFIG_BOUNCE)  += bounce.o
  obj-$(CONFIG_SWAP)    += page_io.o swap_state.o swapfile.o thrash.o
 +obj-$(CONFIG_TMEM)    += tmem.o
 +obj-$(CONFIG_PRESWAP) += preswap.o
 +obj-$(CONFIG_PRECACHE)        += precache.o
  obj-$(CONFIG_HAS_DMA) += dmapool.o
  obj-$(CONFIG_HUGETLBFS)       += hugetlb.o
  obj-$(CONFIG_NUMA)    += mempolicy.o
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
Simple merge