1. 02 11月, 2011 4 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · f470f8d4
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (62 commits)
        mlx4_core: Deprecate log_num_vlan module param
        IB/mlx4: Don't set VLAN in IBoE WQEs' control segment
        IB/mlx4: Enable 4K mtu for IBoE
        RDMA/cxgb4: Mark QP in error before disabling the queue in firmware
        RDMA/cxgb4: Serialize calls to CQ's comp_handler
        RDMA/cxgb3: Serialize calls to CQ's comp_handler
        IB/qib: Fix issue with link states and QSFP cables
        IB/mlx4: Configure extended active speeds
        mlx4_core: Add extended port capabilities support
        IB/qib: Hold links until tuning data is available
        IB/qib: Clean up checkpatch issue
        IB/qib: Remove s_lock around header validation
        IB/qib: Precompute timeout jiffies to optimize latency
        IB/qib: Use RCU for qpn lookup
        IB/qib: Eliminate divide/mod in converting idx to egr buf pointer
        IB/qib: Decode path MTU optimization
        IB/qib: Optimize RC/UC code by IB operation
        IPoIB: Use the right function to do DMA unmap pages
        RDMA/cxgb4: Use correct QID in insert_recv_cqe()
        RDMA/cxgb4: Make sure flush CQ entries are collected on connection close
        ...
      f470f8d4
    • R
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib',... · 504255f8
      Roland Dreier 提交于
      Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next
      504255f8
    • L
      Merge git://github.com/herbertx/crypto · dc47d381
      Linus Torvalds 提交于
      * git://github.com/herbertx/crypto: (48 commits)
        crypto: user - Depend on NET instead of selecting it
        crypto: user - Add dependency on NET
        crypto: talitos - handle descriptor not found in error path
        crypto: user - Initialise match in crypto_alg_match
        crypto: testmgr - add twofish tests
        crypto: testmgr - add blowfish test-vectors
        crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT
        crypto: twofish-x86_64-3way - fix ctr blocksize to 1
        crypto: blowfish-x86_64 - fix ctr blocksize to 1
        crypto: whirlpool - count rounds from 0
        crypto: Add userspace report for compress type algorithms
        crypto: Add userspace report for cipher type algorithms
        crypto: Add userspace report for rng type algorithms
        crypto: Add userspace report for pcompress type algorithms
        crypto: Add userspace report for nivaead type algorithms
        crypto: Add userspace report for aead type algorithms
        crypto: Add userspace report for givcipher type algorithms
        crypto: Add userspace report for ablkcipher type algorithms
        crypto: Add userspace report for blkcipher type algorithms
        crypto: Add userspace report for ahash type algorithms
        ...
      dc47d381
    • E
      sysfs: Make sysfs_rename safe with sysfs_dirents in rbtrees. · f6d90b4f
      Eric W. Biederman 提交于
      In sysfs_rename we need to remove the optimization of not calling
      sysfs_unlink_sibling and sysfs_link_sibling if the renamed parent
      directory is not changing.  This optimization is no longer valid now
      that sysfs dirents are stored in an rbtree sorted by name.
      
      Move the assignment of s_ns before the call of sysfs_link_sibling.  With
      no sysfs_dirent fields changing after the call of sysfs_link_sibling
      this allows sysfs_link_sibling to take any of the directory entries into
      account when it builds the rbtrees, and s_ns looks like a prime canidate
      to be used in the rbtree in the future.
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      Cc: Jiri Slaby <jirislaby@gmail.com>
      Cc: Greg KH <gregkh@suse.de>
      Cc: David Miller <davem@davemloft.net>
      Cc: Mikulas Patocka <mpatocka@redhat.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f6d90b4f
  2. 01 11月, 2011 36 次提交