Merge branches 'core', 'cxgb4', 'iser', 'mlx4', 'mlx5', 'ocrdma', 'odp', 'qib' and 'srp' into for-next

Browse source

...

This commit is contained in:

Roland Dreier 2015-02-20 09:04:40 -08:00

parent 0fb8bcf022 1fc8190dd6 9a3119e4b7 98e8be8693 f614fc15ae 59a39ca3f7 1707cb4ab7 da12c1f685 3453bddbeb

commit 147d1da951

62 changed files with 1204 additions and 556 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

MAINTAINERS

View file

3

drivers/infiniband/core/umem_odp.c

View file

1

drivers/infiniband/core/uverbs.h

View file

149

drivers/infiniband/core/uverbs_cmd.c

View file

1

drivers/infiniband/core/uverbs_main.c

View file

9

drivers/infiniband/hw/cxgb4/ev.c

View file

29

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

View file

3

drivers/infiniband/hw/ipath/ipath_kernel.h

View file

13

drivers/infiniband/hw/ipath/ipath_wc_ppc64.c

View file

15

drivers/infiniband/hw/ipath/ipath_wc_x86_64.c

View file

2

drivers/infiniband/hw/mlx4/cm.c

View file

7

drivers/infiniband/hw/mlx4/cq.c

View file

10

drivers/infiniband/hw/mlx4/main.c

View file

6

drivers/infiniband/hw/mlx4/qp.c

View file

4

drivers/infiniband/hw/mlx5/main.c

View file

1

drivers/infiniband/hw/mlx5/mr.c

View file

38

drivers/infiniband/hw/ocrdma/ocrdma.h

View file

38

drivers/infiniband/hw/ocrdma/ocrdma_ah.c

View file

6

drivers/infiniband/hw/ocrdma/ocrdma_ah.h

View file

312

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

View file

2

drivers/infiniband/hw/ocrdma/ocrdma_hw.h

View file

12

drivers/infiniband/hw/ocrdma/ocrdma_main.c

View file

68

drivers/infiniband/hw/ocrdma/ocrdma_sli.h

View file

241

drivers/infiniband/hw/ocrdma/ocrdma_stats.c

View file

6

drivers/infiniband/hw/ocrdma/ocrdma_stats.h

View file

183

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c

View file

16

drivers/infiniband/hw/qib/qib.h

View file

4

drivers/infiniband/hw/qib/qib_common.h

View file

1

drivers/infiniband/hw/qib/qib_debugfs.c

View file

9

drivers/infiniband/hw/qib/qib_diag.c

View file

5

drivers/infiniband/hw/qib/qib_driver.c

View file

198

drivers/infiniband/hw/qib/qib_eeprom.c

View file

26

drivers/infiniband/hw/qib/qib_file_ops.c

View file

9

drivers/infiniband/hw/qib/qib_fs.c

View file

15

drivers/infiniband/hw/qib/qib_iba6120.c

View file

14

drivers/infiniband/hw/qib/qib_iba7220.c

View file

52

drivers/infiniband/hw/qib/qib_iba7322.c

View file

12

drivers/infiniband/hw/qib/qib_init.c

View file

1

drivers/infiniband/hw/qib/qib_intr.c

View file

4

drivers/infiniband/hw/qib/qib_keys.c

View file

20

drivers/infiniband/hw/qib/qib_mad.c

View file

2

drivers/infiniband/hw/qib/qib_mmap.c

View file

10

drivers/infiniband/hw/qib/qib_mr.c

View file

10

drivers/infiniband/hw/qib/qib_pcie.c

View file

8

drivers/infiniband/hw/qib/qib_qp.c

View file

13

drivers/infiniband/hw/qib/qib_qsfp.c

View file

4

drivers/infiniband/hw/qib/qib_rc.c

View file

8

drivers/infiniband/hw/qib/qib_ruc.c

View file

9

drivers/infiniband/hw/qib/qib_sd7220.c

View file

28

drivers/infiniband/hw/qib/qib_sysfs.c

View file

5

drivers/infiniband/hw/qib/qib_twsi.c

View file

1

drivers/infiniband/hw/qib/qib_tx.c

View file

2

drivers/infiniband/hw/qib/qib_ud.c

View file

8

drivers/infiniband/hw/qib/qib_user_sdma.c

View file

15

drivers/infiniband/hw/qib/qib_verbs.c

View file

4

drivers/infiniband/hw/qib/qib_verbs_mcast.c

View file

7

drivers/infiniband/hw/qib/qib_wc_x86_64.c

View file

4

drivers/infiniband/ulp/iser/iscsi_iser.h

View file

16

drivers/infiniband/ulp/iser/iser_initiator.c

View file

9

drivers/infiniband/ulp/iser/iser_memory.c

View file

27

drivers/infiniband/ulp/iser/iser_verbs.c

View file

23

include/uapi/rdma/ib_user_verbs.h

View file