diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-06-22 14:42:52 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-06-22 14:43:51 -0300 |
| commit | fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233 (patch) | |
| tree | e21b6d503468282cd9010d24b35327dc8d772980 /drivers/net/ethernet/intel/ice/ice_type.h | |
| parent | RDMA/core: Use flexible array for mad data (diff) | |
| parent | Linux 5.13-rc7 (diff) | |
| download | linux-dev-fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233.tar.xz linux-dev-fdcebbc2ac2cfd82a18857b0c85067fa7e8f5233.zip | |
Merge tag 'v5.13-rc7' into rdma.git for-next
Linux 5.13-rc7
Needed for dependencies in following patches. Merge conflict in rxe_cmop.c
resolved by compining both patches.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_type.h')
0 files changed, 0 insertions, 0 deletions