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

..

ccids

…

ackvec.c

dccp: drop null test before destroy functions

2015-09-15 16:49:43 -07:00

ackvec.h

…

ccid.c

dccp: drop null test before destroy functions

2015-09-15 16:49:43 -07:00

ccid.h

…

dccp.h

tcp/dccp: fix hashdance race for passive sessions

2015-10-23 05:42:21 -07:00

diag.c

sock_diag: specify info_size per inet protocol

2015-06-15 19:49:22 -07:00

feat.c

dccp: kerneldoc warning fixes

2014-11-18 15:26:31 -05:00

feat.h

…

input.c

dccp: spelling s/reseting/resetting

2014-11-18 15:26:32 -05:00

ipv4.c

tcp/dccp: fix hashdance race for passive sessions

2015-10-23 05:42:21 -07:00

ipv6.c

ipv6: kill sk_dst_lock

2015-12-03 11:32:06 -05:00

ipv6.h

…

Kconfig

…

Makefile

…

minisocks.c

tcp/dccp: fix hashdance race for passive sessions

2015-10-23 05:42:21 -07:00

options.c

…

output.c

net: Generalise wq_has_sleeper helper

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

probe.c

Use 64-bit timekeeping

2015-11-01 17:01:16 -05:00

proto.c

net: rename SOCK_ASYNC_NOSPACE and SOCK_ASYNC_WAITDATA

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

qpolicy.c

…

sysctl.c

…

timer.c

inet: get rid of central tcp/dccp listener timer

2015-03-20 12:40:25 -04:00