1. 12 Jun, 2009 34 commits
  2. 11 Jun, 2009 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · a525890c
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (23 commits)
        Btrfs: fix extent_buffer leak during tree log replay
        Btrfs: fix oops when btrfs_inherit_iflags called with a NULL dir
        Btrfs: fix -o nodatasum printk spelling
        Btrfs: check duplicate backrefs for both data and metadata
        Btrfs: init worker struct fields before kthread-run
        Btrfs: pin buffers during write_dev_supers
        Btrfs: avoid races between super writeout and device list updates
        Fix btrfs when ACLs are configured out
        Btrfs: fdatasync should skip metadata writeout
        Btrfs: remove crc32c.h and use libcrc32c directly.
        Btrfs: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION
        Btrfs: autodetect SSD devices
        Btrfs: add mount -o ssd_spread to spread allocations out
        Btrfs: avoid allocation clusters that are too spread out
        Btrfs: Add mount -o nossd
        Btrfs: avoid IO stalls behind congested devices in a multi-device FS
        Btrfs: don't allow WRITE_SYNC bios to starve out regular writes
        Btrfs: fix metadata dirty throttling limits
        Btrfs: reduce mount -o ssd CPU usage
        Btrfs: balance btree more often
        ...
      a525890c
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify · 3bb66d7f
      Linus Torvalds authored
      * 'for-linus' of git://git.infradead.org/users/eparis/notify:
        fsnotify: allow groups to set freeing_mark to null
        inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD
        dnotify: do not bother to lock entry->lock when reading mask
        dnotify: do not use ?true:false when assigning to a bool
        fsnotify: move events should indicate the event was on a child
        inotify: reimplement inotify using fsnotify
        fsnotify: handle filesystem unmounts with fsnotify marks
        fsnotify: fsnotify marks on inodes pin them in core
        fsnotify: allow groups to add private data to events
        fsnotify: add correlations between events
        fsnotify: include pathnames with entries when possible
        fsnotify: generic notification queue and waitq
        dnotify: reimplement dnotify using fsnotify
        fsnotify: parent event notification
        fsnotify: add marks to inodes so groups can interpret how to handle those inodes
        fsnotify: unified filesystem notification backend
      3bb66d7f
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://linux-arm.org/linux-2.6 · 512626a0
      Linus Torvalds authored
      * 'for-linus' of git://linux-arm.org/linux-2.6:
        kmemleak: Add the corresponding MAINTAINERS entry
        kmemleak: Simple testing module for kmemleak
        kmemleak: Enable the building of the memory leak detector
        kmemleak: Remove some of the kmemleak false positives
        kmemleak: Add modules support
        kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
        kmemleak: Add the vmalloc memory allocation/freeing hooks
        kmemleak: Add the slub memory allocation/freeing hooks
        kmemleak: Add the slob memory allocation/freeing hooks
        kmemleak: Add the slab memory allocation/freeing hooks
        kmemleak: Add documentation on the memory leak detector
        kmemleak: Add the base support
      
      Manual conflict resolution (with the slab/earlyboot changes) in:
      	drivers/char/vt.c
      	init/main.c
      	mm/slab.c
      512626a0
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-for-linus' of... · 8a1ca8ce
      Linus Torvalds authored
      Merge branch 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (574 commits)
        perf_counter: Turn off by default
        perf_counter: Add counter->id to the throttle event
        perf_counter: Better align code
        perf_counter: Rename L2 to LL cache
        perf_counter: Standardize event names
        perf_counter: Rename enums
        perf_counter tools: Clean up u64 usage
        perf_counter: Rename perf_counter_limit sysctl
        perf_counter: More paranoia settings
        perf_counter: powerpc: Implement generalized cache events for POWER processors
        perf_counters: powerpc: Add support for POWER7 processors
        perf_counter: Accurate period data
        perf_counter: Introduce struct for sample data
        perf_counter tools: Normalize data using per sample period data
        perf_counter: Annotate exit ctx recursion
        perf_counter tools: Propagate signals properly
        perf_counter tools: Small frequency related fixes
        perf_counter: More aggressive frequency adjustment
        perf_counter/x86: Fix the model number of Intel Core2 processors
        perf_counter, x86: Correct some event and umask values for Intel processors
        ...
      8a1ca8ce
    • Linus Torvalds's avatar
      Merge branch 'topic/slab/earlyboot' of... · b640f042
      Linus Torvalds authored
      Merge branch 'topic/slab/earlyboot' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
      
      * 'topic/slab/earlyboot' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        vgacon: use slab allocator instead of the bootmem allocator
        irq: use kcalloc() instead of the bootmem allocator
        sched: use slab in cpupri_init()
        sched: use alloc_cpumask_var() instead of alloc_bootmem_cpumask_var()
        memcg: don't use bootmem allocator in setup code
        irq/cpumask: make memoryless node zero happy
        x86: remove some alloc_bootmem_cpumask_var calling
        vt: use kzalloc() instead of the bootmem allocator
        sched: use kzalloc() instead of the bootmem allocator
        init: introduce mm_init()
        vmalloc: use kzalloc() instead of alloc_bootmem()
        slab: setup allocators earlier in the boot sequence
        bootmem: fix slab fallback on numa
        bootmem: use slab if bootmem is no longer available
      b640f042
    • Eric Paris's avatar
      fsnotify: allow groups to set freeing_mark to null · a092ee20
      Eric Paris authored
      Most fsnotify listeners (all but inotify) do not care about marks being
      freed.  Allow groups to set freeing_mark to null and do not call any
      function if it is set that way.
      Signed-off-by: default avatarEric Paris <eparis@redhat.com>
      a092ee20