Skip to content
  1. Jul 25, 2009
  2. Jul 23, 2009
    • Linus Torvalds's avatar
      Linux 2.6.31-rc4 · 4be3bd78
      Linus Torvalds authored
      4be3bd78
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · b600ffae
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Fix UP compile failure caused by irq_thread_check_affinity
      b600ffae
    • Linus Torvalds's avatar
      Merge branch 'lockdep-for-linus' of... · 81cbf6d0
      Linus Torvalds authored
      Merge branch 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep
      
      * 'lockdep-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep:
        lockdep: Fix lockdep annotation for pipe_double_lock()
      81cbf6d0
    • Bruno Premont's avatar
      genirq: Fix UP compile failure caused by irq_thread_check_affinity · 61f38261
      Bruno Premont authored
      Since genirq: Delegate irq affinity setting to the irq thread
      (591d2fb0
      
      ) compilation with
      CONFIG_SMP=n fails with following error:
      
      /usr/src/linux-2.6/kernel/irq/manage.c:
         In function 'irq_thread_check_affinity':
      /usr/src/linux-2.6/kernel/irq/manage.c:475:
         error: 'struct irq_desc' has no member named 'affinity'
      make[4]: *** [kernel/irq/manage.o] Error 1
      
      That commit adds a new function irq_thread_check_affinity() which
      uses struct irq_desc.affinity which is only available for CONFIG_SMP=y.
      Move that function under #ifdef CONFIG_SMP.
      
      [ tglx@brownpaperbag: compile and boot tested on UP and SMP ]
      
      Signed-off-by: default avatarBruno Premont <bonbons@linux-vserver.org>
      LKML-Reference: <20090722222232.2eb3e1c4@neptune.home>
      Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
      61f38261
    • Peter Zijlstra's avatar
      lockdep: Fix lockdep annotation for pipe_double_lock() · 023d43c7
      Peter Zijlstra authored
      
      
      The presumed use of the pipe_double_lock() routine is to lock 2 locks in
      a deadlock free way by ordering the locks by their address. However it
      fails to keep the specified lock classes in order and explicitly
      annotates a deadlock.
      
      Rectify this.
      
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      LKML-Reference: <1248163763.15751.11098.camel@twins>
      023d43c7
    • Linus Torvalds's avatar
      Merge branch 'perf-counters-for-linus' of... · 3c330108
      Linus Torvalds authored
      Merge branch 'perf-counters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf
      
      * 'perf-counters-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-perf: (31 commits)
        perf_counter tools: Give perf top inherit option
        perf_counter tools: Fix vmlinux symbol generation breakage
        perf_counter: Detect debugfs location
        perf_counter: Add tracepoint support to perf list, perf stat
        perf symbol: C++ demangling
        perf: avoid structure size confusion by using a fixed size
        perf_counter: Fix throttle/unthrottle event logging
        perf_counter: Improve perf stat and perf record option parsing
        perf_counter: PERF_SAMPLE_ID and inherited counters
        perf_counter: Plug more stack leaks
        perf: Fix stack data leak
        perf_counter: Remove unused variables
        perf_counter: Make call graph option consistent
        perf_counter: Add perf record option to log addresses
        perf_counter: Log vfork as a fork event
        perf_counter: Synthesize VDSO mmap event
        perf_counter: Make sure we dont leak kernel memory to userspace
        perf_counter tools: Fix index boundary check
        perf_counter: Fix the tracepoint channel to perfcounters
        perf_counter, x86: Extend perf_counter Pentium M support
        ...
      3c330108
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus-2' of... · 612e900c
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        softirq: introduce tasklet_hrtimer infrastructure
      612e900c
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · c57c3743
      Linus Torvalds authored
      Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        clocksource: Prevent NULL pointer dereference
        timer: Avoid reading uninitialized data
      c57c3743
    • Linus Torvalds's avatar
      Merge branch 'irq-fixes-for-linus' of... · 5b26776b
      Linus Torvalds authored
      Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        genirq: Delegate irq affinity setting to the irq thread
      5b26776b
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · 356d1b52
      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: fix nr_uninterruptible accounting of frozen tasks really
        sched: fix load average accounting vs. cpu hotplug
        sched: Account for vruntime wrapping
      356d1b52
    • Linus Torvalds's avatar
      Merge branch 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc · bb184d11
      Linus Torvalds authored
      * 'tj-block-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
        virtio_blk: mark virtio_blk with __refdata to kill spurious section mismatch
        block: sysfs fix mismatched queue_var_{store,show} in 64bit kernel
        ataflop: adjust NULL test
        block: fix failfast merge testing in elv_rq_merge_ok()
        z2ram: Small cleanup for z2ram.c
      bb184d11
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 · 1f9758d4
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
        fs/Kconfig: move nilfs2 out
      1f9758d4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 · 49ed6573
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
        ide-tape: Don't leak kernel stack information
        ide: fix memory leak when flush command is issued
      49ed6573
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 402168ce
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
        sky2: Avoid races in sky2_down
        drivers/net/mlx4: Adjust constant
        drivers/net: Move a dereference below a NULL test
        drivers/net: Move a dereference below a NULL test
        connector: maintainer/mail update.
        USB host CDC Phonet network interface driver
        macsonic, jazzsonic: fix oops on module unload
        macsonic: move probe function to .devinit.text
        can: switch carrier on if device was stopped while in bus-off state
        can: restart device even if dev_alloc_skb() fails
        can: sja1000: remove duplicated includes
        New device ID for sc92031 [1088:2031]
        3c589_cs: re-initialize the multicast in the tc589_reset
        Fix error return for setsockopt(SO_TIMESTAMPING)
        netxen: fix thermal check and shutdown
        netxen: fix deadlock on dev close
        netxen: fix context deletion sequence
        net: Micrel KS8851 SPI network driver
        tcp: Use correct peer adr when copying MD5 keys
        tcp: Fix MD5 signature checking on IPv4 mapped sockets
        ...
      402168ce
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 12e8ffe3
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        NFSv4: Fix a problem whereby a buggy server can oops the kernel
        NFSv4: Fix an NFSv4 mount regression
        NFSv4: Fix an Oops in nfs4_free_lock_state
      12e8ffe3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 0d517fb1
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: ctxfi: Swapped SURROUND-SIDE channels on emu20k2
        ALSA: ca0106 - Fix the max capture buffer size
        ALSA: hda - Fix pin-setup for Sony VAIO with STAC9872 codecs
        ALSA: hda - Add quirk for Gateway T6834c laptop
        ALSA: OSS sequencer should be initialized after snd_seq_system_client_init
        ALSA: sound/isa: convert nested spin_lock_irqsave to spin_lock
        ALSA: hda_codec: Check for invalid zero connections
      0d517fb1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 1fd1f285
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: Move dereferences below a NULL test
        HID: hiddev, fix lock imbalance
      1fd1f285
    • Arjan van de Ven's avatar
      perf: fix stack data leak · 0dc3d523
      Arjan van de Ven authored
      
      
      the "reserved" field was not initialized to zero, resulting in 4 bytes
      of stack data leaking to userspace....
      
      Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
      Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0dc3d523
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 · 61fe0870
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubi-2.6:
        UBI: fix bug in image sequence number handling
        UBI: gluebi: initialize ubi_num field
      61fe0870
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 71c4c8b7
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: atkbd - add force relese key quirk for Soltech TA12
        Input: fix EVIOCGNAME/JSIOCGNAME regression
        Input: atkbd - add forced release keys quirk for FSC Amilo Pi 3525
        Input: pcspkr - switch driver to dev_pm_ops
        Input: xpad - don't resend successfully sent outgoing requests
        Input: wistron_btns - recognize Maxdata Pro 7000 notebooks
      71c4c8b7
    • Mike Galbraith's avatar
      perf_counter tools: Give perf top inherit option · 0fdc7e67
      Mike Galbraith authored
      
      
      Currently, perf top -p only tracks the pid provided, which isn't very useful
      for watching forky loads, so give it an inherit option.
      
      Signed-off-by: default avatarMike Galbraith <efault@gmx.de>
      Cc: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      LKML-Reference: <1248165036.9795.10.camel@marge.simson.net>
      0fdc7e67