1. 17 Dec, 2009 35 commits
  2. 16 Dec, 2009 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · bea4c899
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        XFS: Free buffer pages array unconditionally
        xfs: kill xfs_bmbt_rec_32/64 types
        xfs: improve metadata I/O merging in the elevator
        xfs: check for not fully initialized inodes in xfs_ireclaim
      bea4c899
    • Roland Dreier's avatar
      re-export alloc_file() · 73efc468
      Roland Dreier authored
      Commit 3d1e4631 ("get rid of init_file()") removed the export of
      alloc_file() -- possibly inadvertently, since that commit mainly
      consisted of deleting the lines between the end of alloc_file() and
      the start of the code in init_file().
      
      There is in fact one modular use of alloc_file() in the tree, in
      drivers/infiniband/core/uverbs_main.c, so re-add the export to fix:
      
          ERROR: "alloc_file" [drivers/infiniband/core/ib_uverbs.ko] undefined!
      
      when CONFIG_INFINIBAND_USER_ACCESS=m.
      
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      73efc468
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.secretlab.ca/git/linux-2.6 · a73611b6
      Linus Torvalds authored
      * 'next' of git://git.secretlab.ca/git/linux-2.6: (23 commits)
        powerpc: fix up for mmu_mapin_ram api change
        powerpc: wii: allow ioremap within the memory hole
        powerpc: allow ioremap within reserved memory regions
        wii: use both mem1 and mem2 as ram
        wii: bootwrapper: add fixup to calc useable mem2
        powerpc: gamecube/wii: early debugging using usbgecko
        powerpc: reserve fixmap entries for early debug
        powerpc: wii: default config
        powerpc: wii: platform support
        powerpc: wii: hollywood interrupt controller support
        powerpc: broadway processor support
        powerpc: wii: bootwrapper bits
        powerpc: wii: device tree
        powerpc: gamecube: default config
        powerpc: gamecube: platform support
        powerpc: gamecube/wii: flipper interrupt controller support
        powerpc: gamecube/wii: udbg support for usbgecko
        powerpc: gamecube/wii: do not include PCI support
        powerpc: gamecube/wii: declare as non-coherent platforms
        powerpc: gamecube/wii: introduce GAMECUBE_COMMON
        ...
      
      Fix up conflicts in arch/powerpc/mm/fsl_booke_mmu.c.
      
      Hopefully even close to correctly.
      a73611b6
    • Linus Torvalds's avatar
      Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5fa3577b
      Linus Torvalds authored
      * 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/vmwgfx: Add DRM driver for VMware Virtual GPU
        drm/vmwgfx: Add svga headers for vmwgfx driver
        drm/ttm: Add more driver type enums
      5fa3577b
    • Linus Torvalds's avatar
      Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6 · d4220f98
      Linus Torvalds authored
      * 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6: (34 commits)
        HWPOISON: Remove stray phrase in a comment
        HWPOISON: Try to allocate migration page on the same node
        HWPOISON: Don't do early filtering if filter is disabled
        HWPOISON: Add a madvise() injector for soft page offlining
        HWPOISON: Add soft page offline support
        HWPOISON: Undefine short-hand macros after use to avoid namespace conflict
        HWPOISON: Use new shake_page in memory_failure
        HWPOISON: Use correct name for MADV_HWPOISON in documentation
        HWPOISON: mention HWPoison in Kconfig entry
        HWPOISON: Use get_user_page_fast in hwpoison madvise
        HWPOISON: add an interface to switch off/on all the page filters
        HWPOISON: add memory cgroup filter
        memcg: add accessor to mem_cgroup.css
        memcg: rename and export try_get_mem_cgroup_from_page()
        HWPOISON: add page flags filter
        mm: export stable page flags
        HWPOISON: limit hwpoison injector to known page types
        HWPOISON: add fs/device filters
        HWPOISON: return 0 to indicate success reliably
        HWPOISON: make semantics of IGNORED/DELAYED clear
        ...
      d4220f98