tree e8ef6b2f0f62477dab50fe7d0435c76460c20f49
parent b1881fb148a67a5b694ac9701672ce6b359abfa4
parent 10313cbb92206450b450e14f2b3f6ccde42d9a34
author Linus Torvalds <torvalds@linux-foundation.org> 1205439932 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1205439932 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB: Allocate priv->tx_ring with vmalloc()
  IPoIB/cm: Set tx_wr.num_sge in connected mode post_send()
  IPoIB: Don't drop multicast sends when they can be queued
  IB/ipath: Reset the retry counter for RDMA_READ_RESPONSE_MIDDLE packets
  IB/ipath: Fix error completion put on send CQ instead of recv CQ
  IB/ipath: Fix RC QP initialization
  IB/ipath: Fix potentially wrong RNR retry counter returned in ipath_query_qp()
  IB/ipath: Fix IB compliance problems with link state vs physical state