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

Browse source

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
  IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop()
  IB/ehca: Fix number of send WRs reported for new QP
  IB/mlx4: Initialize send queue entry ownership bits
  IB/mlx4: Don't allocate RQ doorbell if using SRQ

...

This commit is contained in:

Linus Torvalds 2007-05-25 15:49:56 -07:00

parent a41d7f0004 2dfbfc3712

commit 1ea0975875

5 changed files with 60 additions and 36 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/infiniband/hw/ehca/hcp_if.c

View file

59

drivers/infiniband/hw/mlx4/qp.c

View file

1

drivers/infiniband/ulp/ipoib/ipoib.h

View file

3

drivers/infiniband/ulp/ipoib/ipoib_cm.c

View file

31

drivers/infiniband/ulp/ipoib/ipoib_ib.c

View file