]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc...
authorRoland Dreier <roland@purestorage.com>
Tue, 1 Nov 2011 16:37:08 +0000 (09:37 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 1 Nov 2011 16:37:08 +0000 (09:37 -0700)
commit504255f8d0480cf293962adf4bc3aecac645ae71
tree5ae8663d2bc2eb9e796bfb689f3e462a14742e06
parent2be6053318aa4f2787b7bc5cf5160017d7d1586b
parent615eb715ae10cbaa8079ab8cacf8f4596be4087a
parentf7cc25d018f1e9af6767ee7774bbe83452e9fdf4
parentd32ae393dbf0daf778f9e33b0bc6591cd102391e
parenta5e12dff757b562bbecd6a2359fdc4c43d4d97de
parent3e60a77ea218d1915bdc9127f88ab866fd2ac643
parent787adb9d6ad9afb498a1580a7d8ad05f779c488a
parentcaf6e3f221ddc12ccabd1cd0ba149561db0090d4
parentcb29688aaa4caa4d54df2976118fe99a839bb433
parent0f0bee8bbc2b3e49baa703118041f99db9ef41a1
parent16d99812d58b8af2df29cd337a74cd965b53da04
parent42849b2697c36abdafa6aef64186b15055392046
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next
17 files changed:
drivers/infiniband/core/cma.c
drivers/infiniband/core/ucma.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/core/verbs.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/infiniband/hw/cxgb4/qp.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/hw/mlx4/qp.c
drivers/infiniband/hw/nes/nes_cm.c
drivers/infiniband/hw/nes/nes_cm.h
drivers/infiniband/hw/nes/nes_verbs.h
drivers/infiniband/ulp/ipoib/ipoib_cm.c
drivers/net/mlx4/main.c
drivers/net/mlx4/mlx4.h
drivers/net/mlx4/port.c
include/linux/mlx4/device.h
include/rdma/ib_verbs.h