diff options
| author | Jason Gunthorpe | 2018-10-16 08:01:02 +0200 |
|---|---|---|
| committer | Jason Gunthorpe | 2018-10-16 08:01:02 +0200 |
| commit | 59bfc59a68286c5e6824ec3dddcf5232a73c217e (patch) | |
| tree | ccb6b22ba5238ab7abc691ccfccf52ced7e11aea /drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | |
| parent | RDMA/restrack: Release task struct which was hold by CM_ID object (diff) | |
| parent | IB/mlx5: Unmap DMA addr from HCA before IOMMU (diff) | |
| download | kernel-qcow2-linux-59bfc59a68286c5e6824ec3dddcf5232a73c217e.tar.gz kernel-qcow2-linux-59bfc59a68286c5e6824ec3dddcf5232a73c217e.tar.xz kernel-qcow2-linux-59bfc59a68286c5e6824ec3dddcf5232a73c217e.zip | |
Merge branch 'for-rc' into rdma.git for-next
From git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
This is required to resolve dependencies of the next series of RDMA
patches.
The code motion conflicts in drivers/infiniband/core/cache.c were
resolved.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/t4_msg.h')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h index b8f75a22fb6c..f152da1ce046 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h +++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h @@ -753,7 +753,6 @@ struct cpl_abort_req_rss { }; struct cpl_abort_req_rss6 { - WR_HDR; union opcode_tid ot; __be32 srqidx_status; }; |