Skip to content
Commits on Sep 21, 2009
  1. @torvalds

    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.
    torvalds committed Sep 21, 2009
  2. @torvalds

    Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/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
    torvalds committed Sep 21, 2009
  3. @torvalds

    Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/p…

    …ub/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
    torvalds committed Sep 21, 2009
  4. @torvalds

    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()
    torvalds committed Sep 21, 2009
  5. @torvalds

    Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/sc…

    …m/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
    torvalds committed Sep 21, 2009
  6. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/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
    torvalds committed Sep 21, 2009
  7. @torvalds

    Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block

    * '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
    torvalds committed Sep 21, 2009
  8. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/mchehab/linux-2.6
    
    * '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
      ...
    torvalds committed Sep 21, 2009
  9. @torvalds

    Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

    * '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
    torvalds committed Sep 21, 2009
  10. @torvalds

    Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

    * '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
    torvalds committed Sep 21, 2009
  11. @torvalds

    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/airlied/drm-2.6
    
    * '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.
    torvalds committed Sep 21, 2009
  12. @torvalds

    Driver-Core: fix devnode callbacks for dabusb and industrialio

    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:
    
      e454cea: 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: Ingo Molnar <mingo@elte.hu>
    Industrialio-parts-by: Jean Delvare <khali@linux-fr.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ingo Molnar committed with torvalds Sep 21, 2009
  13. nfs: initialize the backing_dev_info when creating the server

    NFS may free the server structure without ever having used the
    bdi, so we either need to flag the bdi as being uninitialized or
    initialize it up front. This does the latter.
    
    This fixes a crash with mounting more than one NFS file system,
    should people ever need that kind of obscure NFS functionality.
    
    Tested-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Jens Axboe committed Sep 21, 2009
  14. writeback: make balance_dirty_pages() gradually back more off

    Currently it just sleeps for a very short time, just 1 jiffy. If
    we keep looping in there, continually delay for a little longer
    of up to 100msec in total. That was the old limit for congestion
    wait.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Jens Axboe committed Sep 17, 2009
  15. writeback: don't use schedule_timeout() without setting runstate

    Just use schedule_timeout_interruptible(), saves a call to
    set_current_state().
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Jens Axboe committed Sep 17, 2009
  16. nfs: nfs_kill_super() should call bdi_unregister() after killing super

    Otherwise we could be attempting to flush data for a writeback
    thread and bdi that have already disappeared.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    Jens Axboe committed Sep 17, 2009
  17. perf: Tidy up after the big rename

     - provide compatibility Kconfig entry for existing PERF_COUNTERS .config's
    
     - provide courtesy copy of old perf_counter.h, for user-space projects
    
     - small indentation fixups
    
     - fix up MAINTAINERS
    
     - fix small x86 printout fallout
    
     - fix up small PowerPC comment fallout (use 'counter' as in register)
    
    Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Sep 21, 2009
  18. perf: Do the big rename: Performance Counters -> Performance Events

    Bye-bye Performance Counters, welcome Performance Events!
    
    In the past few months the perfcounters subsystem has grown out its
    initial role of counting hardware events, and has become (and is
    becoming) a much broader generic event enumeration, reporting, logging,
    monitoring, analysis facility.
    
    Naming its core object 'perf_counter' and naming the subsystem
    'perfcounters' has become more and more of a misnomer. With pending
    code like hw-breakpoints support the 'counter' name is less and
    less appropriate.
    
    All in one, we've decided to rename the subsystem to 'performance
    events' and to propagate this rename through all fields, variables
    and API names. (in an ABI compatible fashion)
    
    The word 'event' is also a bit shorter than 'counter' - which makes
    it slightly more convenient to write/handle as well.
    
    Thanks goes to Stephane Eranian who first observed this misnomer and
    suggested a rename.
    
    User-space tooling and ABI compatibility is not affected - this patch
    should be function-invariant. (Also, defconfigs were not touched to
    keep the size down.)
    
    This patch has been generated via the following script:
    
      FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')
    
      sed -i \
        -e 's/PERF_EVENT_/PERF_RECORD_/g' \
        -e 's/PERF_COUNTER/PERF_EVENT/g' \
        -e 's/perf_counter/perf_event/g' \
        -e 's/nb_counters/nb_events/g' \
        -e 's/swcounter/swevent/g' \
        -e 's/tpcounter_event/tp_event/g' \
        $FILES
    
      for N in $(find . -name perf_counter.[ch]); do
        M=$(echo $N | sed 's/perf_counter/perf_event/g')
        mv $N $M
      done
    
      FILES=$(find . -name perf_event.*)
    
      sed -i \
        -e 's/COUNTER_MASK/REG_MASK/g' \
        -e 's/COUNTER/EVENT/g' \
        -e 's/\<event\>/event_id/g' \
        -e 's/counter/event/g' \
        -e 's/Counter/Event/g' \
        $FILES
    
    ... to keep it as correct as possible. This script can also be
    used by anyone who has pending perfcounters patches - it converts
    a Linux kernel tree over to the new naming. We tried to time this
    change to the point in time where the amount of pending patches
    is the smallest: the end of the merge window.
    
    Namespace clashes were fixed up in a preparatory patch - and some
    stylistic fallout will be fixed up in a subsequent patch.
    
    ( NOTE: 'counters' are still the proper terminology when we deal
      with hardware registers - and these sed scripts are a bit
      over-eager in renaming them. I've undone some of that, but
      in case there's something left where 'counter' would be
      better than 'event' we can undo that on an individual basis
      instead of touching an otherwise nicely automated patch. )
    
    Suggested-by: Stephane Eranian <eranian@google.com>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Paul Mackerras <paulus@samba.org>
    Reviewed-by: Arjan van de Ven <arjan@linux.intel.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Steven Rostedt <rostedt@goodmis.org>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: David Howells <dhowells@redhat.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: "H. Peter Anvin" <hpa@zytor.com>
    Cc: <linux-arch@vger.kernel.org>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Sep 21, 2009
  19. perf_counter: Rename 'event' to event_id/hw_event

    In preparation to the renames, to avoid a namespace clash.
    
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Sep 21, 2009
  20. perf_counter: Rename list_entry -> group_entry, counter_list -> group…

    …_list
    
    This is in preparation of the big rename, but also makes sense
    in a standalone way: 'list_entry' is a bad name as we already
    have a list_entry() in list.h.
    
    Also, the 'counter list' is too vague, it doesnt tell us the
    purpose of that list.
    
    Clarify these names to show that it's all about the group
    hiearchy.
    
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    LKML-Reference: <new-submission>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Sep 21, 2009
  21. Merge branch 'linus' into perfcounters/rename

    Merge reason: pull in all the latest code before doing the rename.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Ingo Molnar committed Sep 21, 2009
  22. Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/torvalds/linux-2.6 into linux-next
    
    Conflicts:
    	fs/ubifs/super.c
    
    Merge the upstream tree in order to resolve a conflict with the
    per-bdi writeback changes from the linux-2.6-block tree.
    Artem Bityutskiy committed Sep 21, 2009
  23. @pwil3058

    sched: Simplify sys_sched_rr_get_interval() system call

    By removing the need for it to know details of scheduling classes.
    
    This allows PlugSched to define orthogonal scheduling classes.
    
    Signed-off-by: Peter Williams <pwil3058@bigpond.net.au>
    Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Mike Galbraith <efault@gmx.de>
    LKML-Reference: <06d1b89ee15a0eef82d7.1253496713@mudlark.pw.nest>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    pwil3058 committed with Ingo Molnar Sep 21, 2009
  24. @paulusmack

    perf_counter, powerpc, sparc: Fix compilation after perf_counter_over…

    …flow() change
    
    Commit 5622f29 ("x86, perf_counter, bts: Optimize BTS overflow
    handling") removed the regs field from struct perf_sample_data and
    added a regs parameter to perf_counter_overflow().  This breaks the
    build on powerpc (and Sparc) as reported by Sachin Sant:
    
      arch/powerpc/kernel/perf_counter.c: In function 'record_and_restart':
      arch/powerpc/kernel/perf_counter.c:1165: error: unknown field 'regs' specified in initializer
    
    This adjusts arch/powerpc/kernel/perf_counter.c to correspond with the
    new struct perf_sample_data and perf_counter_overflow().
    
    [ v2: also fix Sparc, Markus Metzger <markus.t.metzger@intel.com> ]
    
    Reported-by: Sachin Sant <sachinp@in.ibm.com>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Cc: Markus Metzger <markus.t.metzger@intel.com>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: benh@kernel.crashing.org
    Cc: linuxppc-dev@ozlabs.org
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    LKML-Reference: <19127.8400.376239.586120@drongo.ozlabs.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    paulusmack committed with Ingo Molnar Sep 21, 2009
  25. @theif

    drm/vgaarb: add VGA arbitration support to the drm and kms.

    VGA arb requires DRM support for non-kms drivers, to turn on/off
    irqs when disabling the mem/io regions.
    
    VGA arb requires KMS support for GPUs where we can turn off VGA
    decoding. Currently we know how to do this for intel and radeon
    kms drivers, which allows them to be removed from the arbiter.
    
    This patch comes from Fedora rawhide kernel.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    theif committed Sep 21, 2009
  26. @theif

    drm/radeon: some r420s have a CP race with the DMA engine.

    This patch makes sure the CP doesn't DMA do VRAM while 2D
    is active by inserting a CP resync token.
    
    todo: port to kms.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with theif Sep 21, 2009
  27. @theif

    drm/radeon/r600/kms: rv670 is not DCE3

    RV670 was using the wrong modesetting code.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with theif Sep 18, 2009
  28. drm/radeon/kms: r420 idle after programming GA_ENHANCE

    https://bugs.freedesktop.org/show_bug.cgi?id=24041
    
    The idle allows rs690 to startup properly.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Sep 21, 2009
  29. drm/radeon/kms: more fixes to rv770 suspend/resume path.

    This resumes my
    RV730PRO (4650)
    RV770 (4850)
    fine.
    
    Still researching the RV4550 (RV710), resumes without X fine.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Sep 21, 2009
Commits on Sep 20, 2009
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
      includecheck fix: x86, cpu/common.c
      includecheck fix: kernel/trace, ring_buffer.c
      includecheck fix: include/linux, ftrace.h
      includecheck fix: include/linux, page_cgroup.h
      includecheck fix: include/linux, aio.h
      includecheck fix: include/drm, drm_memory.h
      includecheck fix: include/acpi, acpi_bus.h
      includecheck fix: drivers/xen, evtchn.c
      includecheck fix: drivers/video, vgacon.c
      includecheck fix: drivers/scsi, ibmvscsi.c
      includecheck fix: drivers/scsi, libfcoe.c
      includecheck fix: x86, shadow.c
      includecheck fix: x86, traps.c
      includecheck fix: um, helper.c
      includecheck fix: s390, sys_s390.c
    torvalds committed Sep 20, 2009
  2. @torvalds

    loongson: fix cut-and-paste mis-merge

    Ingo points out that I screwed up when merging the 'timers-for-linus'
    branch in commit a03fdb7.
    
    A bit too much copy-and-pasting caused the end result to have an
    extraneous 'return' in the middle of an expression.  That was obviously
    bogus.  Blush.
    
    Reported-by-with-patch: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Sep 20, 2009
  3. @torvalds

    Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux

    * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
      [PATCH] i2c-imx: make bus available early
      i2c-mv64xxx: correct mv64xxx_i2c_intr() return type
    torvalds committed Sep 20, 2009
  4. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-cor…

    …e-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
      Driver-Core: extend devnode callbacks to provide permissions
    torvalds committed Sep 20, 2009
  5. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (79 commits)
      USB serial: update the console driver
      usb-serial: straighten out serial_open
      usb-serial: add missing tests and debug lines
      usb-serial: rename subroutines
      usb-serial: fix termios initialization logic
      usb-serial: acquire references when a new tty is installed
      usb-serial: change logic of serial lookups
      usb-serial: put subroutines in logical order
      usb-serial: change referencing of port and serial structures
      tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
      tty: Char: mxser, add support for CP112UL
      uartlite: support shared interrupt lines
      tty: USB: serial/mct_u232, fix tty refcnt
      tty: riscom8, fix tty refcnt
      tty: riscom8, fix shutdown declaration
      TTY: fix typos
      tty: Power: fix suspend vt regression
      tty: vt: use printk_once
      tty: handle VT specific compat ioctls in vt driver
      n_tty: move echoctl check and clean up logic
      ...
    torvalds committed Sep 20, 2009
  6. @torvalds

    Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pu…

    …b/scm/linux/kernel/git/tip/linux-2.6-tip
    
    * 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (58 commits)
      perf_counter: Fix perf_copy_attr() pointer arithmetic
      perf utils: Use a define for the maximum length of a trace event
      perf: Add timechart help text and add timechart to "perf help"
      tracing, x86, cpuidle: Move the end point of a C state in the power tracer
      perf utils: Be consistent about minimum text size in the svghelper
      perf timechart: Add "perf timechart record"
      perf: Add the timechart tool
      perf: Add a SVG helper library file
      tracing, perf: Convert the power tracer into an event tracer
      perf: Add a sample_event type to the event_union
      perf: Allow perf utilities to have "callback" options without arguments
      perf: Store trace event name/id pairs in perf.data
      perf: Add a timestamp to fork events
      sched_clock: Make it NMI safe
      perf_counter: Fix up swcounter throttling
      x86, perf_counter, bts: Optimize BTS overflow handling
      perf sched: Add --input=file option to builtin-sched.c
      perf trace: Sample timestamp and cpu when using record flag
      perf tools: Increase MAX_EVENT_LENGTH
      perf tools: Fix memory leak in read_ftrace_printk()
      ...
    torvalds committed Sep 20, 2009
Something went wrong with that request. Please try again.