David S. Miller d5ef8a4d87 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-02-10 23:32:28 -05:00

..

addr.c

infiniband: Convert dst_fetch_ha() over to dst_neigh_lookup().

2012-01-25 21:30:36 -05:00

agent.c

IB/mad: Improve an error message so error code is included

2011-03-18 09:42:20 -07:00

agent.h

RDMA: Remove subversion $Id tags

2008-07-14 23:48:44 -07:00

cache.c

IB/core: Add GID change event

2011-07-18 21:04:30 -07:00

cm_msgs.h

IB/cm: Fix layout of APR message

2012-01-03 21:04:18 -08:00

cm.c

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

cma.c

infiniband changes for 3.3 merge window

2012-01-08 14:05:48 -08:00

core_priv.h

IB/core: Allow device-specific per-port sysfs files

2010-05-21 10:34:44 -07:00

device.c

RDMA: Allow for NULL .modify_device() and .modify_port() methods

2011-07-18 16:44:30 -07:00

fmr_pool.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

iwcm.c

infiniband: Fix up module files that need to include module.h

2011-10-31 19:31:35 -04:00

iwcm.h

…

mad_priv.h

IB/mad: Allow tuning of QP0 and QP1 sizes

2009-09-07 08:28:48 -07:00

mad_rmpp.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

mad_rmpp.h

RDMA: Remove subversion $Id tags

2008-07-14 23:48:44 -07:00

mad.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

Makefile

RDMA: Add netlink infrastructure

2011-05-20 11:46:11 -07:00

multicast.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

netlink.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

packer.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

sa_query.c

RDMA: Update missed conversion of flush_scheduled_work()

2011-01-28 16:39:08 -08:00

sa.h

IB: Remove garbage non-ASCII characters from comments

2007-07-09 16:17:32 -07:00

smi.c

IB/mad: Check hop count field in directed route MAD to avoid array overflow

2009-09-05 20:24:10 -07:00

smi.h

IB/mad: Enable loopback of DR SMP responses from userspace

2008-01-25 14:15:25 -08:00

sysfs.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

ucm.c

rdma/core: Fix sparse warnings

2012-01-04 09:17:45 -08:00

ucma.c

RDMA/ucma: Discard all events for new connections until accepted

2012-01-27 10:07:48 -08:00

ud_header.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

umem.c

Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2011-11-06 19:44:47 -08:00

user_mad.c

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

uverbs_cmd.c

RDMA/core: Fix kernel panic by always initializing qp->usecnt

2012-01-27 09:20:10 -08:00

uverbs_main.c

switch device_get_devnode() and ->devnode() to umode_t *

2012-01-03 22:54:55 -05:00

uverbs_marshall.c

infiniband: add in export.h for files using EXPORT_SYMBOL/THIS_MODULE

2011-10-31 19:31:35 -04:00

uverbs.h

RDMA/uverbs: Export ib_open_qp() capability to user space

2011-10-13 09:50:56 -07:00

verbs.c

RDMA/core: Fix kernel panic by always initializing qp->usecnt

2012-01-27 09:20:10 -08:00