diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-10-18 13:07:13 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-10-18 13:07:13 -0400 |
| commit | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (patch) | |
| tree | 0a39eda714b8b0bb3522654fb326e499fbe552e7 /drivers/infiniband/hw/qib/qib_sdma.c | |
| parent | IB/mlx5: Use ARRAY_SIZE (diff) | |
| parent | IB/srp: Make CM timeout dependent on subnet timeout (diff) | |
| download | linux-dev-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.tar.xz linux-dev-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.zip | |
Merge branch 'for-next-early' into for-next
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base. I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_sdma.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_sdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_sdma.c b/drivers/infiniband/hw/qib/qib_sdma.c index 891873b38a1e..c3690bd51582 100644 --- a/drivers/infiniband/hw/qib/qib_sdma.c +++ b/drivers/infiniband/hw/qib/qib_sdma.c @@ -808,7 +808,7 @@ void __qib_sdma_process_event(struct qib_pportdata *ppd, * bringing the link up with traffic active on * 7220, e.g. */ ss->go_s99_running = 1; - /* fall through and start dma engine */ + /* fall through -- and start dma engine */ case qib_sdma_event_e10_go_hw_start: /* This reference means the state machine is started */ sdma_get(&ppd->sdma_state); |