1. 01 Apr, 2010 31 commits
  2. 30 Mar, 2010 6 commits
  3. 29 Mar, 2010 3 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 · 9623e5a2
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
        ocfs2: Fix a race in o2dlm lockres mastery
        Ocfs2: Handle deletion of reflinked oprhan inodes correctly.
        Ocfs2: Journaling i_flags and i_orphaned_slot when adding inode to orphan dir.
        ocfs2: Clear undo bits when local alloc is freed
        ocfs2: Init meta_ac properly in ocfs2_create_empty_xattr_block.
        ocfs2: Fix the update of name_offset when removing xattrs
        ocfs2: Always try for maximum bits with new local alloc windows
        ocfs2: set i_mode on disk during acl operations
        ocfs2: Update i_blocks in reflink operations.
        ocfs2: Change bg_chain check for ocfs2_validate_gd_parent.
        [PATCH] Skip check for mandatory locks when unlocking
      9623e5a2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 9f321603
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (28 commits)
        ceph: update discussion list address in MAINTAINERS
        ceph: some documentations fixes
        ceph: fix use after free on mds __unregister_request
        ceph: avoid loaded term 'OSD' in documention
        ceph: fix possible double-free of mds request reference
        ceph: fix session check on mds reply
        ceph: handle kmalloc() failure
        ceph: propagate mds session allocation failures to caller
        ceph: make write_begin wait propagate ERESTARTSYS
        ceph: fix snap rebuild condition
        ceph: avoid reopening osd connections when address hasn't changed
        ceph: rename r_sent_stamp r_stamp
        ceph: fix connection fault con_work reentrancy problem
        ceph: prevent dup stale messages to console for restarting mds
        ceph: fix pg pool decoding from incremental osdmap update
        ceph: fix mds sync() race with completing requests
        ceph: only release unused caps with mds requests
        ceph: clean up handle_cap_grant, handle_caps wrt session mutex
        ceph: fix session locking in handle_caps, ceph_check_caps
        ceph: drop unnecessary WARN_ON in caps migration
        ...
      9f321603
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 9d54e2c0
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (asc7621) Add X58 entry in Kconfig
        hwmon: (w83793) Saving negative errors in unsigned
        hwmon: (coretemp) Add missing newline to dev_warn() message
        hwmon: (coretemp) Fix cpu model output
      9d54e2c0