David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

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

2015-12-03 21:09:12 -05:00

..

af_rxrpc.c

net: Generalise wq_has_sleeper helper

2015-11-30 14:47:33 -05:00

ar-accept.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

ar-ack.c

rxrpc: Correctly handle ack at end of client call transmit phase

2015-11-24 17:14:50 -05:00

ar-call.c

af_rxrpc: Keep rxrpc_call pointers in a hashtable

2014-03-04 10:36:53 +00:00

ar-connection.c

mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd

2015-11-06 17:50:42 -08:00

ar-connevent.c

rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()

2011-05-19 18:35:58 -04:00

ar-error.c

ip: fix error queue empty skb handling

2015-03-08 23:01:54 -04:00

ar-input.c

RxRPC: Handle VERSION Rx protocol packets

2015-04-01 16:31:26 +01:00

ar-internal.h

rxrpc: Replace get_seconds with ktime_get_seconds

2015-09-20 21:53:56 -07:00

ar-key.c

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

ar-local.c

net: Add a struct net parameter to sock_create_kern

2015-05-11 10:50:17 -04:00

ar-output.c

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

2015-12-01 15:45:05 -05:00

ar-peer.c

net/rxrpc/ar-peer.c: remove invalid reference to list iterator variable

2012-07-09 15:24:33 -07:00

ar-proc.c

…

ar-recvmsg.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-03-20 18:51:09 -04:00

ar-security.c

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

ar-skbuff.c

af_rxrpc: Improve ACK production

2014-02-26 17:25:07 +00:00

ar-transport.c

rxrpc: Replace get_seconds with ktime_get_seconds

2015-09-20 21:53:56 -07:00

Kconfig

net/rxrpc: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:40:02 -08:00

Makefile

af_rxrpc: Add sysctls for configuring RxRPC parameters

2014-02-26 17:25:06 +00:00

rxkad.c

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

sysctl.c

af_rxrpc: Expose more RxRPC parameters via sysctls

2014-02-26 17:25:07 +00:00