diff options
author | Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
commit | 970eae15600a883e4ad27dd0757b18871cc983ab (patch) | |
tree | 7aeb639a35ca2ab8b54a5987837f8ac5f96ee5f4 /drivers/infiniband/hw/irdma/main.h | |
parent | 27f4432577e4f78bbdf15c104748cc738db8eead (diff) | |
parent | 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (diff) | |
download | linux-970eae15600a883e4ad27dd0757b18871cc983ab.tar.gz |
BackMerge tag 'v5.15-rc7' into drm-next
The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/irdma/main.h')
-rw-r--r-- | drivers/infiniband/hw/irdma/main.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/irdma/main.h b/drivers/infiniband/hw/irdma/main.h index 743d9e143a99..b678fe712447 100644 --- a/drivers/infiniband/hw/irdma/main.h +++ b/drivers/infiniband/hw/irdma/main.h @@ -346,7 +346,6 @@ struct irdma_device { bool roce_mode:1; bool roce_dcqcn_en:1; bool dcb:1; - bool reset:1; bool iw_ooo:1; enum init_completion_state init_state; |