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

Browse source

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Fix lock flag variable location, bump version number
  IB/ehca: Serialize HCA-related hCalls if necessary
  IB/ehca: Return correct number of SGEs for SRQ

...

This commit is contained in:

Linus Torvalds 2007-12-17 09:52:11 -08:00

parent a12e60621b 3d758a4a48

commit ac0b50dd10

5 changed files with 28 additions and 20 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

1

drivers/infiniband/hw/ehca/ehca_classes.h

View file

15

drivers/infiniband/hw/ehca/ehca_main.c

View file

4

drivers/infiniband/hw/ehca/ehca_qp.c

View file

27

drivers/infiniband/hw/ehca/hcp_if.c

View file

1

drivers/infiniband/hw/ehca/hipz_hw.h

View file