kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-09-26 18:16:26 +00:00
Code Issues Releases Packages Activity

Merge branch 'timer_setup' into for-next

Browse source 
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>
This commit is contained in:
Doug Ledford 2017-10-18 13:12:09 -04:00
commit 894b82c427
43 changed files with 158 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/infiniband/hw/cxgb3/iwch_cm.c
View file

1
drivers/infiniband/hw/cxgb3/iwch_provider.c
View file

1
drivers/infiniband/hw/cxgb3/iwch_provider.h
View file

13
drivers/infiniband/hw/cxgb4/cm.c
View file

1
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
View file

1
drivers/infiniband/hw/cxgb4/qp.c
View file

7
drivers/infiniband/hw/hfi1/aspm.h
View file

19
drivers/infiniband/hw/hfi1/chip.c
View file

7
drivers/infiniband/hw/hfi1/driver.c
View file

2
drivers/infiniband/hw/hfi1/init.c
View file

4
drivers/infiniband/hw/hfi1/mad.c
View file

2
drivers/infiniband/hw/hfi1/mad.h
View file

8
drivers/infiniband/hw/hfi1/sdma.c
View file

9
drivers/infiniband/hw/hfi1/verbs.c
View file

7
drivers/infiniband/hw/i40iw/i40iw_cm.c
View file

1
drivers/infiniband/hw/i40iw/i40iw_ctrl.c
View file

1
drivers/infiniband/hw/i40iw/i40iw_type.h
View file

17
drivers/infiniband/hw/i40iw/i40iw_utils.c
View file

6
drivers/infiniband/hw/nes/nes.h
View file

5
drivers/infiniband/hw/nes/nes_cm.c
View file

20
drivers/infiniband/hw/nes/nes_hw.c
View file

1
drivers/infiniband/hw/nes/nes_hw.h
View file

9
drivers/infiniband/hw/nes/nes_mgt.c
View file

3
drivers/infiniband/hw/nes/nes_nic.c
View file

11
drivers/infiniband/hw/nes/nes_utils.c
View file

10
drivers/infiniband/hw/nes/nes_verbs.c
View file

4
drivers/infiniband/hw/qib/qib.h
View file

1
drivers/infiniband/hw/qib/qib_7220.h
View file

11
drivers/infiniband/hw/qib/qib_driver.c
View file

19
drivers/infiniband/hw/qib/qib_iba6120.c
View file

20
drivers/infiniband/hw/qib/qib_iba7220.c
View file

17
drivers/infiniband/hw/qib/qib_iba7322.c
View file

29
drivers/infiniband/hw/qib/qib_init.c
View file

6
drivers/infiniband/hw/qib/qib_intr.c
View file

14
drivers/infiniband/hw/qib/qib_mad.c
View file

10
drivers/infiniband/hw/qib/qib_sd7220.c
View file

4
drivers/infiniband/hw/qib/qib_tx.c
View file

6
drivers/infiniband/hw/qib/qib_verbs.c
View file

10
drivers/infiniband/sw/rdmavt/qp.c
View file

2
drivers/infiniband/ulp/ipoib/ipoib.h
View file

6
drivers/infiniband/ulp/ipoib/ipoib_ib.c
View file

3
drivers/infiniband/ulp/ipoib/ipoib_main.c
View file

10
drivers/net/ethernet/mellanox/mlx4/catas.c
View file