Roland Dreier fb1b5034e4 Merge branch 'ip-roce' into for-next ...

Conflicts:
	drivers/infiniband/hw/mlx4/main.c

2014-01-22 23:24:21 -08:00

..

addr.c

IB/core: Ethernet L2 attributes in verbs/cm structures

2014-01-14 14:20:54 -08:00

agent.c

…

agent.h

…

cache.c

IB/core: Add ib_find_exact_cached_pkey()

2012-09-30 20:33:30 -07:00

cm_msgs.h

IB/core: Move CM_xxx_ATTR_ID macros from cm_msgs.h to ib_cm.h

2012-07-08 18:05:06 -07:00

cm.c

IB/cm: Fix missing unlock on error in cm_init_qp_rtr_attr()

2014-01-19 15:14:04 -08:00

cma.c

Merge branch 'ip-roce' into for-next

2014-01-22 23:24:21 -08:00

core_priv.h

IB/core: Resolve Ethernet L2 addresses when modifying QP

2014-01-19 15:14:04 -08:00

device.c

IB/core: Handle table with full and partial membership for the same P_Key

2012-09-30 20:33:29 -07:00

fmr_pool.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

iwcm.c

IB/core: Fix unused variable warning

2014-01-22 22:55:04 -08:00

iwcm.h

…

mad_priv.h

…

mad_rmpp.c

…

mad_rmpp.h

…

mad.c

IB/core: Create QP1 using the pkey index which contains the default pkey

2013-07-31 14:15:17 -07:00

Makefile

IB/core: Make ib_addr a core IB module

2014-01-19 15:14:04 -08:00

multicast.c

…

netlink.c

IB/netlink: Remove superfluous RDMA_NL_GET_OP() masking

2013-11-08 14:42:54 -08:00

packer.c

…

sa_query.c

IB/core: Ethernet L2 attributes in verbs/cm structures

2014-01-14 14:20:54 -08:00

sa.h

…

smi.c

…

smi.h

…

sysfs.c

IB/core: Add support for RDMA_NODE_USNIC_UDP

2014-01-18 13:48:54 -08:00

ucm.c

IB/core: convert to idr_alloc()

2013-02-27 19:10:16 -08:00

ucma.c

IB/cma: IBoE (RoCE) IP-based GID addressing

2014-01-18 14:12:35 -08:00

ud_header.c

…

umem.c

IB/core: Fix mismatch between locked and pinned pages

2012-05-11 11:38:22 -07:00

user_mad.c

…

uverbs_cmd.c

IB/core: Resolve Ethernet L2 addresses when modifying QP

2014-01-19 15:14:04 -08:00

uverbs_main.c

IB/uverbs: Check access to userspace response buffer in extended command

2013-12-20 10:54:34 -08:00

uverbs_marshall.c

…

uverbs.h

IB/uverbs: New macro to set pointers to NULL if length is 0 in INIT_UDATA()

2013-12-20 10:53:44 -08:00

verbs.c

Merge branch 'ip-roce' into for-next

2014-01-22 23:24:21 -08:00