Doug Ledford 894b82c427 Merge branch 'timer_setup' into for-next ...

Conflicts:
	drivers/infiniband/hw/cxgb4/cm.c
	drivers/infiniband/hw/qib/qib_driver.c
	drivers/infiniband/hw/qib/qib_mad.c

There were minor fixups needed in these files.  Just minor context diffs
due to patches from independent sources touching the same basic area.

Signed-off-by: Doug Ledford <dledford@redhat.com>

2017-10-18 13:12:09 -04:00

..

i40iw_cm.c

Merge branch 'timer_setup' into for-next

2017-10-18 13:12:09 -04:00

i40iw_cm.h

i40iw: Do not retransmit MPA request after it is ACKed

2017-10-04 15:29:39 -04:00

i40iw_ctrl.c

RDMA/i40iw: Convert timers to use timer_setup()

2017-10-09 12:19:41 -04:00

i40iw_d.h

i40iw: Fix parsing of query/commit FPM buffers

2017-08-16 11:27:44 -04:00

i40iw_hmc.c

i40iw: add hmc resource files

2016-02-29 17:10:53 -05:00

i40iw_hmc.h

i40iw: add hmc resource files

2016-02-29 17:10:53 -05:00

i40iw_hw.c

RDMA/i40iw: Suppress gcc 7 fall-through complaints

2017-10-14 20:47:06 -04:00

i40iw_main.c

i40iw: Prevent multiple netdev event notifier registrations

2017-09-22 13:43:36 -04:00

i40iw_osdep.h

RDMA/i40iw: Remove MSS change support

2017-06-01 16:59:52 -04:00

i40iw_p.h

i40iw: Add missing memory barriers

2017-10-04 15:28:49 -04:00

i40iw_pble.c

i40iw: Simplify code

2017-08-18 14:01:08 -04:00

i40iw_pble.h

i40iw: add pble resource files

2016-02-29 17:10:53 -05:00

i40iw_puda.c

Merge branch 'for-next-early' into for-next

2017-10-18 13:07:13 -04:00

i40iw_puda.h

i40iw: Reorganize structures to align with HW capabilities

2016-12-12 17:20:29 -05:00

i40iw_register.h

i40iw: add X722 register file

2016-03-16 13:50:53 -04:00

i40iw_status.h

i40iw: Correct variable names

2017-08-16 11:27:44 -04:00

i40iw_type.h

RDMA/i40iw: Convert timers to use timer_setup()

2017-10-09 12:19:41 -04:00

i40iw_ucontext.h

i40iw: Set 128B as the only supported RQ WQE size

2016-12-22 11:36:12 -05:00

i40iw_uk.c

i40iw: Do not generate CQE for RTR on QP flush

2017-10-04 15:29:39 -04:00

i40iw_user.h

i40iw: Do not generate CQE for RTR on QP flush

2017-10-04 15:29:39 -04:00

i40iw_utils.c

Merge branch 'timer_setup' into for-next

2017-10-18 13:12:09 -04:00

i40iw_verbs.c

Merge branch 'for-next-early' into for-next

2017-10-18 13:07:13 -04:00

i40iw_verbs.h

i40iw: Free QP PBLEs when the QP is destroyed

2017-07-20 11:20:49 -04:00

i40iw_vf.c

i40iw: constify i40iw_vf_cqp_ops structure

2016-05-13 13:47:07 -04:00

i40iw_vf.h

i40iw: constify i40iw_vf_cqp_ops structure

2016-05-13 13:47:07 -04:00

i40iw_virtchnl.c

RDMA/i40iw: fix duplicated code for different branches

2017-06-01 17:00:29 -04:00

i40iw_virtchnl.h

i40iw: virtual channel handling files

2016-03-16 13:50:53 -04:00

i40iw.h

i40iw: Prevent multiple netdev event notifier registrations

2017-09-22 13:43:36 -04:00

Kconfig

IB: Move PCI dependency from root KConfig to HW's KConfigs

2017-09-27 08:54:19 -04:00

Makefile

i40iw: Kconfig and Makefile for iwarp module

2016-03-16 13:50:54 -04:00