1. 28 Oct, 2010 27 commits
  2. 27 Oct, 2010 13 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 81280572
      Linus Torvalds authored
      * 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (50 commits)
        ext4,jbd2: convert tracepoints to use major/minor numbers
        ext4: optimize orphan_list handling for ext4_setattr
        ext4: fix unbalanced mutex unlock in error path of ext4_li_request_new
        ext4: fix compile error in ext4_fallocate()
        ext4: move ext4_mb_{get,put}_buddy_cache_lock and make them static
        ext4: rename mark_bitmap_end() to ext4_mark_bitmap_end()
        ext4: move flush_completed_IO to fs/ext4/fsync.c and make it static
        ext4: rename {ext,idx}_pblock and inline small extent functions
        ext4: make various ext4 functions be static
        ext4: rename {exit,init}_ext4_*() to ext4_{exit,init}_*()
        ext4: fix kernel oops if the journal superblock has a non-zero j_errno
        ext4: update writeback_index based on last page scanned
        ext4: implement writeback livelock avoidance using page tagging
        ext4: tidy up a void argument in inode.c
        ext4: add batched_discard into ext4 feature list
        ext4: Add batched discard support for ext4
        fs: Add FITRIM ioctl
        ext4: Use return value from sb_issue_discard()
        ext4: Check return value of sb_getblk() and friends
        ext4: use bio layer instead of buffer layer in mpage_da_submit_io
        ...
      81280572
    • Theodore Ts'o's avatar
      Merge branch 'next' into upstream-merge · a107e5a3
      Theodore Ts'o authored
      Conflicts:
      	fs/ext4/inode.c
      	fs/ext4/mballoc.c
      	include/trace/events/ext4.h
      a107e5a3
    • Linus Torvalds's avatar
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · b83db1de
      Linus Torvalds authored
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/radeon/kms: enable unmappable vram for evergreen
        drm/radeon/kms: fix tiled db height calculation on 6xx/7xx
        drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx
      b83db1de
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · 7d2f280e
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (24 commits)
        quota: Fix possible oops in __dquot_initialize()
        ext3: Update kernel-doc comments
        jbd/2: fixed typos
        ext2: fixed typo.
        ext3: Fix debug messages in ext3_group_extend()
        jbd: Convert atomic_inc() to get_bh()
        ext3: Remove misplaced BUFFER_TRACE() in ext3_truncate()
        jbd: Fix debug message in do_get_write_access()
        jbd: Check return value of __getblk()
        ext3: Use DIV_ROUND_UP() on group desc block counting
        ext3: Return proper error code on ext3_fill_super()
        ext3: Remove unnecessary casts on bh->b_data
        ext3: Cleanup ext3_setup_super()
        quota: Fix issuing of warnings from dquot_transfer
        quota: fix dquot_disable vs dquot_transfer race v2
        jbd: Convert bitops to buffer fns
        ext3/jbd: Avoid WARN() messages when failing to write the superblock
        jbd: Use offset_in_page() instead of manual calculation
        jbd: Remove unnecessary goto statement
        jbd: Use printk_ratelimited() in journal_alloc_journal_head()
        ...
      7d2f280e
    • Theodore Ts'o's avatar
      ext4,jbd2: convert tracepoints to use major/minor numbers · a269029d
      Theodore Ts'o authored
      
      
      Unfortunately perf can't deal with anything other than direct structure
      accesses in the TP_printk() section.  It will drop dead when it sees
      jbd2_dev_to_name() in the "print fmt" section of the tracepoint.
      
      Addresses-Google-Bug: 3138508
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      a269029d
    • Dmitry Monakhov's avatar
      ext4: optimize orphan_list handling for ext4_setattr · 3d287de3
      Dmitry Monakhov authored
      
      
      Surprisingly chown() on ext4 is not SMP scalable operation. 
      Due to unconditional orphan_del(NULL, inode) in ext4_setattr()
      result in significant performance overhead because of global orphan
      mutex, especially in no-journal mode (where orphan_add() is noop).
      It is possible to skip explicit orphan_del if possible.
      Results of fchown() micro-benchmark in no-journal mode
      while (1) {
         iteration++;
         fchown(fd, uid, gid);
         fchown(fd, uid + 1, gid + 1)
      }
      measured: iterations per millisecond
      | nr_tasks | w/o patch | with patch |
      |        1 |       142 |        185 |
      |        4 |       109 |        642 |
      Signed-off-by: default avatarDmitry Monakhov <dmonakhov@openvz.org>
      Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
      3d287de3
    • Nicolas Kaiser's avatar
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · e3e1288e
      Linus Torvalds authored
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (48 commits)
        DMAENGINE: move COH901318 to arch_initcall
        dma: imx-dma: fix signedness bug
        dma/timberdale: simplify conditional
        ste_dma40: remove channel_type
        ste_dma40: remove enum for endianess
        ste_dma40: remove TIM_FOR_LINK option
        ste_dma40: move mode_opt to separate config
        ste_dma40: move channel mode to a separate field
        ste_dma40: move priority to separate field
        ste_dma40: add variable to indicate valid dma_cfg
        async_tx: make async_tx channel switching opt-in
        move async raid6 test to lib/Kconfig.debug
        dmaengine: Add Freescale i.MX1/21/27 DMA driver
        intel_mid_dma: change the slave interface
        intel_mid_dma: fix the WARN_ONs
        intel_mid_dma: Add sg list support to DMA driver
        intel_mid_dma: Allow DMAC2 to share interrupt
        intel_mid_dma: Allow IRQ sharing
        intel_mid_dma: Add runtime PM support
        DMAENGINE: define a dummy filter function for ste_dma40
        ...
      e3e1288e
    • Linus Torvalds's avatar
      Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 · 9ae6d039
      Linus Torvalds authored
      * 'viafb-next' of git://github.com/schandinat/linux-2.6: (29 commits)
        viafb: add initial VX900 support
        viafb: fix hardware acceleration for suspend & resume
        viafb: make suspend and resume work (on all machines?)
        viafb: restore display on resume
        Minimal support for viafb suspend/resume
        viafb: use proper register for colour when doing fill ops
        viafb: add documentation for proc interface
        viafb: rename output devices
        viafb: add a mapping of supported output devices
        viafb: set sync polarity for all output devices
        viafb: add function to change sync polarity per device
        viafb: reduce I2C timeout and delay
        viafb: enable I2C for CRT
        viafb: fix i2c_transfer error handling
        viafb: vt1636 cleanup
        viafb: introduce per output device power management
        viafb: limit LCD code impact
        viafb: add interface for output device configuration
        viafb: merge the remaining output path with enable functions
        viafb: use new device routing
        ...
      9ae6d039
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 · bdab2250
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: (44 commits)
        MN10300: Save frame pointer in thread_info struct rather than global var
        MN10300: Change "Matsushita" to "Panasonic".
        MN10300: Create a defconfig for the ASB2364 board
        MN10300: Update the ASB2303 defconfig
        MN10300: ASB2364: Add support for SMSC911X and SMC911X
        MN10300: ASB2364: Handle the IRQ multiplexer in the FPGA
        MN10300: Generic time support
        MN10300: Specify an ELF HWCAP flag for MN10300 Atomic Operations Unit support
        MN10300: Map userspace atomic op regs as a vmalloc page
        MN10300: And Panasonic AM34 subarch and implement SMP
        MN10300: Delete idle_timestamp from irq_cpustat_t
        MN10300: Make various interrupt priority settings configurable
        MN10300: Optimise do_csum()
        MN10300: Implement atomic ops using atomic ops unit
        MN10300: Make the FPU operate in non-lazy mode under SMP
        MN10300: SMP TLB flushing
        MN10300: Use the [ID]PTEL2 registers rather than [ID]PTEL for TLB control
        MN10300: Make the use of PIDR to mark TLB entries controllable
        MN10300: Rename __flush_tlb*() to local_flush_tlb*()
        MN10300: AM34 erratum requires MMUCTR read and write on exception entry
        ...
      bdab2250
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 7c5814c7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: usb-audio: automatically detect feedback format
        ASoC: sound/wm9090: add missing __devexit marker
        ASoC: sound/max98088: add missing __devexit marker
        ASoC: sound/ad73311: add missing __devexit marker
        ASoC: fsl - fix build error in pcm030-audio-fabric.c
        sound/oss/sb_ess.c: delete double assignment
        ALSA: hda - Change BTL amp level on some HP notebooks
      7c5814c7
    • Linus Torvalds's avatar
      Merge branch 'perf-fixes-for-linus' of... · a042e261
      Linus Torvalds authored
      Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
        perf python scripting: Add futex-contention script
        perf python scripting: Fixup cut'n'paste error in sctop script
        perf scripting: Shut up 'perf record' final status
        perf record: Remove newline character from perror() argument
        perf python scripting: Support fedora 11 (audit 1.7.17)
        perf python scripting: Improve the syscalls-by-pid script
        perf python scripting: print the syscall name on sctop
        perf python scripting: Improve the syscalls-counts script
        perf python scripting: Improve the failed-syscalls-by-pid script
        kprobes: Remove redundant text_mutex lock in optimize
        x86/oprofile: Fix uninitialized variable use in debug printk
        tracing: Fix 'faild' -> 'failed' typo
        perf probe: Fix format specified for Dwarf_Off parameter
        perf trace: Fix detection of script extension
        perf trace: Use $PERF_EXEC_PATH in canned report scripts
        perf tools: Document event modifiers
        perf tools: Remove direct slang.h include
        perf_events: Fix for transaction recovery in group_sched_in()
        perf_events: Revert: Fix transaction recovery in group_sched_in()
        perf, x86: Use NUMA aware allocations for PEBS/BTS/DS allocations
        ...
      a042e261
    • Linus Torvalds's avatar
      Merge branch 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus · f66dd539
      Linus Torvalds authored
      * 'module' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
        NULL-terminate all pci_device_id tables
        (trivial) Fix compiler warning in kernel/modules.c
      f66dd539