1. 29 1月, 2014 5 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · e770d73c
      Linus Torvalds 提交于
      Pull s390 patches from Martin Schwidefsky:
       "A new binary interface to be able to query and modify the LPAR
        scheduler weight and cap settings.  Some improvements for the hvc
        terminal over iucv and a couple of bux fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/hypfs: add interface for diagnose 0x304
        s390: wire up sys_sched_setattr/sys_sched_getattr
        s390/uapi: fix struct statfs64 definition
        s390/uaccess: remove dead extern declarations, make functions static
        s390/uaccess: test if current->mm is set before walking page tables
        s390/zfcpdump: make zfcpdump depend on 64BIT
        s390/32bit: fix cmpxchg64
        s390/xpram: don't modify module parameters
        s390/zcrypt: remove zcrypt kmsg documentation again
        s390/hvc_iucv: Automatically assign free HVC terminal devices
        s390/hvc_iucv: Display connection details through device attributes
        s390/hvc_iucv: fix sparse warning
        s390/vmur: Link parent CCW device during UR device creation
      e770d73c
    • L
      Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris · be864971
      Linus Torvalds 提交于
      Pull cris fix from Jesper Nilsson:
       "One include too much was removed"
      
      * tag 'cris-correction-for-3.14' of git://jni.nu/cris:
        CRISv10: Readd missing header
      be864971
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · a53b75b3
      Linus Torvalds 提交于
      Pull ext4 update from Ted Ts'o:
       "Bug fixes and cleanups for ext4.  We also enable the punch hole
        functionality for bigalloc file systems"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: delete "set but not used" variables
        ext4: don't pass freed handle to ext4_walk_page_buffers
        ext4: avoid clearing beyond i_blocks when truncating an inline data file
        ext4: ext4_inode_is_fast_symlink should use EXT4_CLUSTER_SIZE
        ext4: fix a typo in extents.c
        ext4: use %pd printk specificer
        ext4: standardize error handling in ext4_da_write_inline_data_begin()
        ext4: retry allocation when inline->extent conversion failed
        ext4: enable punch hole for bigalloc
      a53b75b3
    • L
      Merge tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 2b2b15c3
      Linus Torvalds 提交于
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
         - stable fix for an infinite loop in RPC state machine
         - stable fix for a use after free situation in the NFSv4 trunking discovery
         - stable fix for error handling in the NFSv4 trunking discovery
         - stable fix for the page write update code
         - stable fix for the NFSv4.1 mount time security negotiation
         - stable fix for the NFSv4 open code.
         - O_DIRECT locking fixes
         - fix an Oops in the pnfs file commit code
         - RPC layer needs finer grained handling of connection errors
         - more RPC GSS upcall fixes"
      
      * tag 'nfs-for-3.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (30 commits)
        pnfs: Proper delay for NFS4ERR_RECALLCONFLICT in layout_get_done
        pnfs: fix BUG in filelayout_recover_commit_reqs
        nfs4: fix discover_server_trunking use after free
        NFSv4.1: Handle errors correctly in nfs41_walk_client_list
        nfs: always make sure page is up-to-date before extending a write to cover the entire page
        nfs: page cache invalidation for dio
        nfs: take i_mutex during direct I/O reads
        nfs: merge nfs_direct_write into nfs_file_direct_write
        nfs: merge nfs_direct_read into nfs_file_direct_read
        nfs: increment i_dio_count for reads, too
        nfs: defer inode_dio_done call until size update is done
        nfs: fix size updates for aio writes
        nfs4.1: properly handle ENOTSUP in SECINFO_NO_NAME
        NFSv4.1: Fix a race in nfs4_write_inode
        NFSv4.1: Don't trust attributes if a pNFS LAYOUTCOMMIT is outstanding
        point to the right include file in a comment (left over from a9004abc)
        NFS: dprintk() should not print negative fileids and inode numbers
        nfs: fix dead code of ipv6_addr_scope
        sunrpc: Fix infinite loop in RPC state machine
        SUNRPC: Add tracepoint for socket errors
        ...
      2b2b15c3
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · bf3d846b
      Linus Torvalds 提交于
      Pull vfs updates from Al Viro:
       "Assorted stuff; the biggest pile here is Christoph's ACL series.  Plus
        assorted cleanups and fixes all over the place...
      
        There will be another pile later this week"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (43 commits)
        __dentry_path() fixes
        vfs: Remove second variable named error in __dentry_path
        vfs: Is mounted should be testing mnt_ns for NULL or error.
        Fix race when checking i_size on direct i/o read
        hfsplus: remove can_set_xattr
        nfsd: use get_acl and ->set_acl
        fs: remove generic_acl
        nfs: use generic posix ACL infrastructure for v3 Posix ACLs
        gfs2: use generic posix ACL infrastructure
        jfs: use generic posix ACL infrastructure
        xfs: use generic posix ACL infrastructure
        reiserfs: use generic posix ACL infrastructure
        ocfs2: use generic posix ACL infrastructure
        jffs2: use generic posix ACL infrastructure
        hfsplus: use generic posix ACL infrastructure
        f2fs: use generic posix ACL infrastructure
        ext2/3/4: use generic posix ACL infrastructure
        btrfs: use generic posix ACL infrastructure
        fs: make posix_acl_create more useful
        fs: make posix_acl_chmod more useful
        ...
      bf3d846b
  2. 28 1月, 2014 35 次提交