Merge branches 'ehca' and 'mlx4' into for-linus (b0f43dcc) · Commits · Kyle Evans / linux-next · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

linux-next
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this page for instructions on how to get full permissions. Sorry for the inconvenience.

Admin message

source.puri.sm will be down starting March 18, 6:00 UTC, for a server migration. We expect the migration to take up to 4 hours.

b0f43dcc

Commit b0f43dcc authored 16 years ago by Roland Dreier

Downloads
- Plain Diff

Merge branches 'ehca' and 'mlx4' into for-linus

parents 7ec4f463 42ab01c3

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

drivers/infiniband/hw/mlx4/cq.c 5 additions, 0 deletions

drivers/infiniband/hw/mlx4/cq.c
drivers/net/mlx4/main.c 8 additions, 0 deletions

drivers/net/mlx4/main.c
drivers/net/mlx4/mlx4.h 1 addition, 0 deletions

drivers/net/mlx4/mlx4.h
drivers/net/mlx4/port.c 38 additions, 1 deletion

drivers/net/mlx4/port.c
include/linux/mlx4/device.h 1 addition, 0 deletions

include/linux/mlx4/device.h

with 53 additions and 1 deletion

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