Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

c35a2549

Commit c35a2549 authored 16 years ago by Roland Dreier

Downloads
- Plain Diff

Merge branches 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mlx4' and 'nes' into for-next

parents b3e123cf fad96ab6 a8b56f29 ff79ae80 7f3abf5c 63369366

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

drivers/infiniband/hw/ehca/ehca_irq.c 28 additions, 16 deletions

drivers/infiniband/hw/ehca/ehca_irq.c
drivers/infiniband/hw/ehca/ehca_qp.c 5 additions, 0 deletions

drivers/infiniband/hw/ehca/ehca_qp.c
drivers/infiniband/hw/ipath/ipath_ruc.c 5 additions, 5 deletions

drivers/infiniband/hw/ipath/ipath_ruc.c
drivers/infiniband/hw/mlx4/mr.c 1 addition, 0 deletions

drivers/infiniband/hw/mlx4/mr.c
drivers/infiniband/hw/nes/nes.c 16 additions, 0 deletions

drivers/infiniband/hw/nes/nes.c
drivers/infiniband/hw/nes/nes_hw.h 1 addition, 0 deletions

drivers/infiniband/hw/nes/nes_hw.h
drivers/infiniband/hw/nes/nes_verbs.c 43 additions, 21 deletions

drivers/infiniband/hw/nes/nes_verbs.c
drivers/infiniband/ulp/ipoib/ipoib_main.c 4 additions, 2 deletions

drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/mlx4/mlx4.h 3 additions, 6 deletions

drivers/net/mlx4/mlx4.h

with 106 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment