1. 06 Mar, 2010 34 commits
  2. 05 Mar, 2010 6 commits
    • Linus Torvalds's avatar
      Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 64096c17
      Linus Torvalds authored
      * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
        SLUB: Fix per-cpu merge conflict
        failslab: add ability to filter slab caches
        slab: fix regression in touched logic
        dma kmalloc handling fixes
        slub: remove impossible condition
        slab: initialize unused alien cache entry as NULL at alloc_alien_cache().
        SLUB: Make slub statistics use this_cpu_inc
        SLUB: this_cpu: Remove slub kmem_cache fields
        SLUB: Get rid of dynamic DMA kmalloc cache allocation
        SLUB: Use this_cpu operations in slub
      64096c17
    • Linus Torvalds's avatar
      Merge branch 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · cc7889ff
      Linus Torvalds authored
      * 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (44 commits)
        NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping
        NFS: Clean up nfs_sync_mapping
        NFS: Simplify nfs_wb_page()
        NFS: Replace __nfs_write_mapping with sync_inode()
        NFS: Simplify nfs_wb_page_cancel()
        NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages
        NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set
        NFS: Reduce the number of unnecessary COMMIT calls
        NFS: Add a count of the number of unstable writes carried by an inode
        NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c
        nfs41 fix NFS4ERR_CLID_INUSE for exchange id
        NFS: Fix an allocation-under-spinlock bug
        SUNRPC: Handle EINVAL error returns from the TCP connect operation
        NFSv4.1: Various fixes to the sequence flag error handling
        nfs4: renewd renew operations should take/put a client reference
        nfs41: renewd sequence operations should take/put client reference
        nfs: prevent backlogging of renewd requests
        nfs: kill renewd before clearing client minor version
        NFS: Make close(2) asynchronous when closing NFS O_DIRECT files
        NFS: Improve NFS iostat byte count accuracy for writes
        ...
      cc7889ff
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · b13d3c6e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: Add hardlink support to .u extension
        9P2010.L handshake: .L protocol negotiation
        9P2010.L handshake: Remove "dotu" variable
        9P2010.L handshake: Add mount option
        9P2010.L handshake: Add VFS flags
        net/9p: Handle mount errors correctly.
        net/9p: Remove MAX_9P_CHAN limit
        net/9p: Add multi channel support.
      b13d3c6e
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 · e213e26a
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6: (33 commits)
        quota: stop using QUOTA_OK / NO_QUOTA
        dquot: cleanup dquot initialize routine
        dquot: move dquot initialization responsibility into the filesystem
        dquot: cleanup dquot drop routine
        dquot: move dquot drop responsibility into the filesystem
        dquot: cleanup dquot transfer routine
        dquot: move dquot transfer responsibility into the filesystem
        dquot: cleanup inode allocation / freeing routines
        dquot: cleanup space allocation / freeing routines
        ext3: add writepage sanity checks
        ext3: Truncate allocated blocks if direct IO write fails to update i_size
        quota: Properly invalidate caches even for filesystems with blocksize < pagesize
        quota: generalize quota transfer interface
        quota: sb_quota state flags cleanup
        jbd: Delay discarding buffers in journal_unmap_buffer
        ext3: quota_write cross block boundary behaviour
        quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota
        quota: split out compat_sys_quotactl support from quota.c
        quota: split out netlink notification support from quota.c
        quota: remove invalid optimization from quota_sync_all
        ...
      
      Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c
      e213e26a
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm · c812a51d
      Linus Torvalds authored
      * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits)
        KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP
        KVM: VMX: Update instruction length on intercepted BP
        KVM: Fix emulate_sys[call, enter, exit]()'s fault handling
        KVM: Fix segment descriptor loading
        KVM: Fix load_guest_segment_descriptor() to inject page fault
        KVM: x86 emulator: Forbid modifying CS segment register by mov instruction
        KVM: Convert kvm->requests_lock to raw_spinlock_t
        KVM: Convert i8254/i8259 locks to raw_spinlocks
        KVM: x86 emulator: disallow opcode 82 in 64-bit mode
        KVM: x86 emulator: code style cleanup
        KVM: Plan obsolescence of kernel allocated slots, paravirt mmu
        KVM: x86 emulator: Add LOCK prefix validity checking
        KVM: x86 emulator: Check CPL level during privilege instruction emulation
        KVM: x86 emulator: Fix popf emulation
        KVM: x86 emulator: Check IOPL level during io instruction emulation
        KVM: x86 emulator: fix memory access during x86 emulation
        KVM: x86 emulator: Add Virtual-8086 mode of emulation
        KVM: x86 emulator: Add group9 instruction decoding
        KVM: x86 emulator: Add group8 instruction decoding
        KVM: do not store wqh in irqfd
        ...
      
      Trivial conflicts in Documentation/feature-removal-schedule.txt
      c812a51d
    • Aneesh Kumar K.V's avatar
      fs/9p: Add hardlink support to .u extension · 5717144a
      Aneesh Kumar K.V authored
      For regular file and directories we put the link
      count in th extension field in a tagged string format.
      Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      5717144a