OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
868df53
e6806e9
)
Merge remote-tracking branch 'mlx5-next/mlx5-next' into for-next
author
Doug Ledford
<dledford@redhat.com>
Mon, 26 Aug 2019 14:28:05 +0000
(10:28 -0400)
committer
Doug Ledford
<dledford@redhat.com>
Mon, 26 Aug 2019 14:28:05 +0000
(10:28 -0400)
Bring in the lastest mlx5-next branch as the RDMA RX RoCE Steering
Support patch series requires it (first two patches are in mlx5-next,
final patch in RDMA tree).
Signed-off-by: Doug Ledford <dledford@redhat.com>
1
2
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mlx5/fs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mlx5/mlx5_ifc.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
Simple merge
diff --cc
include/linux/mlx5/fs.h
Simple merge
diff --cc
include/linux/mlx5/mlx5_ifc.h
Simple merge