Merge branches 'mlx5', 'qib' and 'srp' into for-next (e04abfa2) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

Die monatliche GitLab Wartung findet am Donnerstag den 10.4. statt, daher wird GitLab an diesem Tag zwischen 17 Uhr und 18 Uhr nicht erreichbar sein

e04abfa2

Commit e04abfa2 authored 11 years ago by Roland Dreier

Downloads
- Plain Diff

Merge branches 'mlx5', 'qib' and 'srp' into for-next

parents 0eba5511 5e631a03 0b3ddf38 80d5e8a2

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

drivers/infiniband/hw/mlx5/mr.c 4 additions, 4 deletions

drivers/infiniband/hw/mlx5/mr.c
drivers/infiniband/hw/qib/qib.h 1 addition, 1 deletion

drivers/infiniband/hw/qib/qib.h
drivers/infiniband/hw/qib/qib_iba7322.c 114 additions, 0 deletions

drivers/infiniband/hw/qib/qib_iba7322.c
drivers/infiniband/hw/qib/qib_init.c 3 additions, 3 deletions

drivers/infiniband/hw/qib/qib_init.c
drivers/infiniband/hw/qib/qib_sdma.c 56 additions, 0 deletions

drivers/infiniband/hw/qib/qib_sdma.c
drivers/infiniband/ulp/srp/ib_srp.c 1 addition, 2 deletions

drivers/infiniband/ulp/srp/ib_srp.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c 5 additions, 5 deletions

drivers/net/ethernet/mellanox/mlx5/core/cmd.c
drivers/net/ethernet/mellanox/mlx5/core/debugfs.c 4 additions, 8 deletions

drivers/net/ethernet/mellanox/mlx5/core/debugfs.c
drivers/net/ethernet/mellanox/mlx5/core/main.c 1 addition, 1 deletion

drivers/net/ethernet/mellanox/mlx5/core/main.c
include/linux/mlx5/device.h 2 additions, 2 deletions

include/linux/mlx5/device.h

with 191 additions and 26 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