1. 07 Apr, 2010 24 commits
  2. 06 Apr, 2010 13 commits
  3. 05 Apr, 2010 3 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 · 7da23b86
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
        [SCSI] qla1280: retain firmware for error recovery
        [SCSI] attirbute_container: Initialize sysfs attributes with sysfs_attr_init
        [SCSI] advansys: fix regression with request_firmware change
        [SCSI] qla2xxx: Updated version number to 8.03.02-k2.
        [SCSI] qla2xxx: Prevent sending mbx commands from sysfs during isp reset.
        [SCSI] qla2xxx: Disable MSI on qla24xx chips other than QLA2432.
        [SCSI] qla2xxx: Check to make sure multique and CPU affinity support is not enabled at the same time.
        [SCSI] qla2xxx: Correct vp_idx checking during PORT_UPDATE processing.
        [SCSI] qla2xxx: Honour "Extended BB credits" bit for CNAs.
        [SCSI] scsi_transport_fc: Make sure commands are completed when rport is offline
        [SCSI] libiscsi: Fix recovery slowdown regression
      7da23b86
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · 749d2297
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        9p: saving negative to unsigned char
        9p: return on mutex_lock_interruptible()
        9p: Creating files with names too long should fail with ENAMETOOLONG.
        9p: Make sure we are able to clunk the cached fid on umount
        9p: drop nlink remove
        fs/9p: Clunk the fid resulting from partial walk of the name
        9p: documentation update
        9p: Fix setting of protocol flags in v9fs_session_info structure.
      749d2297
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable · 795d580b
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
        Btrfs: add check for changed leaves in setup_leaf_for_split
        Btrfs: create snapshot references in same commit as snapshot
        Btrfs: fix small race with delalloc flushing waitqueue's
        Btrfs: use add_to_page_cache_lru, use __page_cache_alloc
        Btrfs: fix chunk allocate size calculation
        Btrfs: kill max_extent mount option
        Btrfs: fail to mount if we have problems reading the block groups
        Btrfs: check btrfs_get_extent return for IS_ERR()
        Btrfs: handle kmalloc() failure in inode lookup ioctl
        Btrfs: dereferencing freed memory
        Btrfs: Simplify num_stripes's calculation logical for __btrfs_alloc_chunk()
        Btrfs: Add error handle for btrfs_search_slot() in btrfs_read_chunk_tree()
        Btrfs: Remove unnecessary finish_wait() in wait_current_trans()
        Btrfs: add NULL check for do_walk_down()
        Btrfs: remove duplicate include in ioctl.c
      
      Fix trivial conflict in fs/btrfs/compression.c due to slab.h include
      cleanups.
      795d580b