projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b874155
40e020c
)
Merge tag 'v4.20-rc6' into rdma.git for-next
author
Jason Gunthorpe
<jgg@mellanox.com>
Tue, 11 Dec 2018 21:24:57 +0000
(14:24 -0700)
committer
Jason Gunthorpe
<jgg@mellanox.com>
Tue, 11 Dec 2018 21:24:57 +0000
(14:24 -0700)
For dependencies in following patches.
1
2
drivers/infiniband/core/umem_odp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/odp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/infiniband/hw/mlx5/qp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/en.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/infiniband/core/umem_odp.c
Simple merge
diff --cc
drivers/infiniband/hw/hns/hns_roce_hw_v2.c
Simple merge
diff --cc
drivers/infiniband/hw/mlx5/main.c
Simple merge
diff --cc
drivers/infiniband/hw/mlx5/odp.c
Simple merge
diff --cc
drivers/infiniband/hw/mlx5/qp.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge
diff --cc
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
Simple merge