1. 22 Sep, 2009 28 commits
  2. 21 Sep, 2009 12 commits
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-rename-for-linus' of... · 43c1266c
      Linus Torvalds authored
      Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf: Tidy up after the big rename
        perf: Do the big rename: Performance Counters -> Performance Events
        perf_counter: Rename 'event' to event_id/hw_event
        perf_counter: Rename list_entry -> group_entry, counter_list -> group_list
      
      Manually resolved some fairly trivial conflicts with the tracing tree in
      include/trace/ftrace.h and kernel/trace/trace_syscalls.c.
      43c1266c
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus' of... · b8c7f1dc
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: Fix whitespace inconsistencies
        rcu: Fix thinko, actually initialize full tree
        rcu: Apply results of code inspection of kernel/rcutree_plugin.h
        rcu: Add WARN_ON_ONCE() consistency checks covering state transitions
        rcu: Fix synchronize_rcu() for TREE_PREEMPT_RCU
        rcu: Simplify rcu_read_unlock_special() quiescent-state accounting
        rcu: Add debug checks to TREE_PREEMPT_RCU for premature grace periods
        rcu: Kconfig help needs to say that TREE_PREEMPT_RCU scales down
        rcutorture: Occasionally delay readers enough to make RCU force_quiescent_state
        rcu: Initialize multi-level RCU grace periods holding locks
        rcu: Need to update rnp->gpnum if preemptable RCU is to be reliable
      b8c7f1dc
    • Linus Torvalds's avatar
      Merge branch 'perfcounters-fixes-for-linus' of... · f4eccb6d
      Linus Torvalds authored
      Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        perf_counter, powerpc, sparc: Fix compilation after perf_counter_overflow() change
        perf_counter: x86: Fix PMU resource leak
        perf util: SVG performance improvements
        perf util: Make the timechart SVG width dynamic
        perf timechart: Show the duration of scheduler delays in the SVG
        perf timechart: Show the name of the waker/wakee in timechart
      f4eccb6d
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · 8e4bc3dd
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Simplify sys_sched_rr_get_interval() system call
        sched: Fix potential NULL derference of doms_cur
        sched: Fix raciness in runqueue_is_locked()
        sched: Re-add lost cpu_allowed check to sched_fair.c::select_task_rq_fair()
        sched: Remove unneeded indentation in sched_fair.c::place_entity()
      8e4bc3dd
    • Linus Torvalds's avatar
      Merge branch 'tracing-fixes-for-linus' of... · bd4c3a34
      Linus Torvalds authored
      Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        kernel/profile.c: Switch /proc/irq/prof_cpu_mask to seq_file
        tracing: Export trace_profile_buf symbols
        tracing/events: use list_for_entry_continue
        tracing: remove max_tracer_type_len
        function-graph: use ftrace_graph_funcs directly
        tracing: Remove markers
        tracing: Allocate the ftrace event profile buffer dynamically
        tracing: Factorize the events profile accounting
      bd4c3a34
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · b3727c24
      Linus Torvalds authored
      Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: Print the hypervisor returned tsc_khz during boot
        x86: Correct segment permission flags in 64-bit linker script
        x86: cpuinit-annotate SMP boot trampolines properly
        x86: Increase timeout for EHCI debug port reset completion in early printk
        x86: Fix uaccess_32.h typo
        x86: Trivial whitespace cleanups
        x86, apic: Fix missed handling of discrete apics
        x86/i386: Remove duplicated #include
        x86, mtrr: Convert loop to a while based construct, avoid naked semicolon
        Revert 'x86: Fix system crash when loading with "reservetop" parameter'
        x86, mce: Fix compile warning in case of CONFIG_SMP=n
        x86, apic: Use logical flat on intel with <= 8 logical cpus
        x86: SGI UV: Map MMIO-High memory range
        x86: SGI UV: Add volatile semantics to macros that access chipset registers
        x86: SGI UV: Fix IPI macros
        x86: apic: Convert BUG() to BUG_ON()
        x86: Remove final bits of CONFIG_X86_OLD_MCE
      b3727c24
    • Linus Torvalds's avatar
      Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block · 58e75a09
      Linus Torvalds authored
      * 'writeback' of git://git.kernel.dk/linux-2.6-block:
        nfs: initialize the backing_dev_info when creating the server
        writeback: make balance_dirty_pages() gradually back more off
        writeback: don't use schedule_timeout() without setting runstate
        nfs: nfs_kill_super() should call bdi_unregister() after killing super
      58e75a09
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · c720f565
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (222 commits)
        V4L/DVB (13033): pt1: Don't use a deprecated DMA_BIT_MASK macro
        V4L/DVB (13029): radio-si4713: remove #include <linux/version.h>
        V4L/DVB (13027): go7007: convert printks to v4l2_info
        V4L/DVB (13026): s2250-board: Implement brightness and contrast controls
        V4L/DVB (13025): s2250-board: Fix memory leaks
        V4L/DVB (13024): go7007: Implement vidioc_g_std and vidioc_querystd
        V4L/DVB (13023): go7007: Merge struct gofh and go declarations
        V4L/DVB (13022): go7007: Fix mpeg controls
        V4L/DVB (13021): go7007: Fix whitespace and line lengths
        V4L/DVB (13020): go7007: Updates to Kconfig and Makefile
        V4L/DVB (13019): video: initial support for ADV7180
        V4L/DVB (13018): kzalloc failure ignored in au8522_probe()
        V4L/DVB (13017): gspca: kmalloc failure ignored in sd_start()
        V4L/DVB (13016): kmalloc failure ignored in lgdt3304_attach() and s921_attach()
        V4L/DVB (13015): kmalloc failure ignored in m920x_firmware_download()
        V4L/DVB (13014): Add support for Compro VideoMate E800 (DVB-T part only)
        V4L/DVB (13013): FM TX: si4713: Kconfig: Fixed two typos.
        V4L/DVB (13012): uvc: introduce missing kfree
        V4L/DVB (13011): Change tuner type of BeholdTV cards
        V4L/DVB (13009): gspca - stv06xx-hdcs: Reduce exposure range
        ...
      c720f565
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · 33e6c1a0
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: fix debugging dump
        UBIFS: improve lprops dump
        UBIFS: various minor commentary fixes
        UBIFS: improve journal head debugging prints
        UBIFS: define journal head numbers in ubifs-media.h
        UBIFS: amend commentaries
        UBIFS: check ubifs_scan error codes better
        UBIFS: do not print scary error messages needlessly
        UBIFS: add inode size debugging check
        UBIFS: constify file and inode operations
        UBIFS: remove unneeded call from ubifs_sync_fs
        UBIFS: kill BKL
        UBIFS: remove unused functions
        UBIFS: suppress compilation warning
      33e6c1a0
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 0b887ef1
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: improve NOR flash erasure quirk
        UBI: introduce flash dump helper
        UBI: eliminate possible undefined behaviour
        UBI: print a warning if too many PEBs are corrupted
        UBI: amend NOR flash pre-erase quirk
        UBI: print a message if ECH is corrupted and VIDH is ok
      0b887ef1
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 44040f10
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
        drm/vgaarb: add VGA arbitration support to the drm and kms.
        drm/radeon: some r420s have a CP race with the DMA engine.
        drm/radeon/r600/kms: rv670 is not DCE3
        drm/radeon/kms: r420 idle after programming GA_ENHANCE
        drm/radeon/kms: more fixes to rv770 suspend/resume path.
        drm/radeon/kms: more alignment for rv770.c with r600.c
        drm/radeon/kms: rv770 blit init called too late.
        drm/radeon/kms: move around new init path code to avoid posting at init
        drm/radeon/r600: fix some issues with suspend/resume.
        drm/radeon/kms: disable VGA rendering engine before taking over VRAM
        drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
        drm/radeon/kms: add initial connector properties
        drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
        drm/radeon/kms: don't fail if we fail to init GPU acceleration
        drm/r600/kms: fixup number of loops per blit calculation.
        drm/radeon/kms: reprogram format in set base.
        drm/radeon: avivo chips have no separate int bit for display
        drm/radeon/r600: don't do interrupts
        drm: fix _DRM_GEM addmap error message
        drm: update crtc x/y when only fb changes
        ...
      
      Fixed up trivial conflicts in firmware/Makefile due to network driver
      (cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
      other.
      44040f10
    • Ingo Molnar's avatar
      Driver-Core: fix devnode callbacks for dabusb and industrialio · 388dba30
      Ingo Molnar authored
      The build of the dabusb driver broke:
      
        drivers/media/video/dabusb.c:758: error: unknown field 'nodename' specified in initializer
        drivers/media/video/dabusb.c:758: warning: initialization from incompatible pointer type
        make[3]: *** wait: No child processes.  Stop.
      
      Due to this commit:
      
        e454cea2: Driver-Core: extend devnode callbacks to provide permissions
      
      Missing the dabusb driver's dabusb_nodename() callback.
      
      Similar issues with the iio/industrialio driver in staging, pointed out
      and patched by Jean Delvare.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Industrialio-parts-by: default avatarJean Delvare <khali@linux-fr.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      388dba30