Skip to content
  1. May 24, 2011
  2. May 19, 2011
    • Linus Torvalds's avatar
      Linux 2.6.39 · 61c4f2c8
      Linus Torvalds authored
      v2.6.39
      61c4f2c8
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 3f80fbff
      Linus Torvalds authored
      * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        configfs: Fix race between configfs_readdir() and configfs_d_iput()
        configfs: Don't try to d_delete() negative dentries.
        ocfs2/dlm: Target node death during resource migration leads to thread spin
        ocfs2: Skip mount recovery for hard-ro mounts
        ocfs2/cluster: Heartbeat mismatch message improved
        ocfs2/cluster: Increase the live threshold for global heartbeat
        ocfs2/dlm: Use negotiated o2dlm protocol version
        ocfs2: skip existing hole when removing the last extent_rec in punching-hole codes.
        ocfs2: Initialize data_ac (might be used uninitialized)
      3f80fbff
    • Linus Torvalds's avatar
      Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 · fce51958
      Linus Torvalds authored
      * 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6:
        drivercore: revert addition of of_match to struct device
        of: fix race when matching drivers
      fce51958
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus · 7103dbed
      Linus Torvalds authored
      * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
        MIPS: Kludge IP27 build for 2.6.39.
        MIPS: AR7: Fix GPIO register size for Titan variant.
        MIPS: Fix duplicate invocation of notify_die.
        MIPS: RB532: Fix iomap resource size miscalculation.
      7103dbed
    • Grant Likely's avatar
      drivercore: revert addition of of_match to struct device · b1608d69
      Grant Likely authored
      Commit b826291c
      
      , "drivercore/dt: add a match table pointer to struct
      device" added an of_match pointer to struct device to cache the
      of_match_table entry discovered at driver match time.  This was unsafe
      because matching is not an atomic operation with probing a driver.  If
      two or more drivers are attempted to be matched to a driver at the
      same time, then the cached matching entry pointer could get
      overwritten.
      
      This patch reverts the of_match cache pointer and reworks all users to
      call of_match_device() directly instead.
      
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      b1608d69
    • Milton Miller's avatar
      of: fix race when matching drivers · 01294d82
      Milton Miller authored
      
      
      If two drivers are probing devices at the same time, both will write
      their match table result to the dev->of_match cache at the same time.
      
      Only write the result if the device matches.
      
      In a thread titled "SBus devices sometimes detected, sometimes not",
      Meelis reported his SBus hme was not detected about 50% of the time.
      From the debug suggested by Grant it was obvious another driver matched
      some devices between the call to match the hme and the hme discovery
      failling.
      
      Reported-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarMilton Miller <miltonm@bga.com>
      [grant.likely: modified to only call of_match_device() once]
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      01294d82
  3. May 18, 2011
  4. May 17, 2011
    • Linus Torvalds's avatar
      Merge branch 'timers-fixes-for-linus' of... · a085963a
      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:
        tick: Clear broadcast active bit when switching to oneshot
        rtc: mc13xxx: Don't call rtc_device_register while holding lock
        rtc: rp5c01: Initialize drvdata before registering device
        rtc: pcap: Initialize drvdata before registering device
        rtc: msm6242: Initialize drvdata before registering device
        rtc: max8998: Initialize drvdata before registering device
        rtc: max8925: Initialize drvdata before registering device
        rtc: m41t80: Initialize clientdata before registering device
        rtc: ds1286: Initialize drvdata before registering device
        rtc: ep93xx: Initialize drvdata before registering device
        rtc: davinci: Initialize drvdata before registering device
        rtc: mxc: Initialize drvdata before registering device
        clocksource: Install completely before selecting
      a085963a