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

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

ccids

dccp: re-enable debug macro

2014-02-16 23:45:00 -05:00

ackvec.c

dccp: drop null test before destroy functions

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

ackvec.h

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

ccid.c

dccp: drop null test before destroy functions

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

ccid.h

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

dccp.h

net: snmp: kill STATS_BH macros

2016-04-27 22:48:25 -04: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

net: dccp: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

input.c

dccp: do not assume DCCP code is non preemptible

2016-05-02 17:02:25 -04:00

ipv4.c

inet: drop ->bind_conflict

2017-01-18 13:04:28 -05:00

ipv6.c

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

2017-01-28 10:33:06 -05:00

ipv6.h

inet: includes a sock_common in request_sock

2013-10-10 00:08:07 -04:00

Kconfig

net/dccp: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:39:34 -08:00

Makefile

dccp: Policy-based packet dequeueing infrastructure

2010-12-07 13:47:12 +01:00

minisocks.c

dccp: rename DCCP_INC_STATS_BH()

2016-04-27 22:48:22 -04:00

options.c

dccp: do not assume DCCP code is non preemptible

2016-05-02 17:02:25 -04:00

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

dccp: do not send reset to already closed sockets

2016-11-03 16:16:51 -04:00

qpolicy.c

dccp qpolicy: Parameter checking of cmsg qpolicy parameters

2010-12-07 13:47:12 +01:00

sysctl.c

dccp: make the request_retries minimum is 1

2014-05-14 15:34:16 -04:00

timer.c

net: rename NET_{ADD|INC}_STATS_BH()

2016-04-27 22:48:24 -04:00