David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
ccids	dccp: fix undefined behavior with 'cwnd' shift in ccid2_cwnd_restart()	2018-08-07 15:34:44 -07:00
Kconfig	net: dccp: Remove dccpprobe module	2018-01-02 14:27:30 -05:00
Makefile	net: dccp: Remove dccpprobe module	2018-01-02 14:27:30 -05:00
ackvec.c	net: dccp: drop unneeded newline	2018-01-02 13:49:32 -05: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	dccp: fool proof ccid_hc_[rt]x_parse_options()	2019-02-01 14:49:10 -08:00
dccp.h	Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL	2018-06-28 10:40:47 -07:00
diag.c	sock_diag: specify info_size per inet protocol	2015-06-15 19:49:22 -07:00
feat.c	dccp: fix a memleak for dccp_feat_init err process	2017-07-27 00:01:05 -07:00
feat.h	net: dccp: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
input.c	tcp: Refactor pingpong code	2019-01-27 13:29:43 -08:00
ipv4.c	net: Convert protocol error handlers from void to int	2018-11-08 17:13:08 -08:00
ipv6.c	net: Convert protocol error handlers from void to int	2018-11-08 17:13:08 -08:00
ipv6.h	inet: includes a sock_common in request_sock	2013-10-10 00:08:07 -04:00
minisocks.c	net-tcp: remove useless tw_timeout field	2018-06-05 10:45:24 -04:00
options.c	net: dccp: mark expected switch fall-throughs	2017-10-16 21:15:21 +01:00
output.c	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01:00
proto.c	mm: convert totalram_pages and totalhigh_pages variables to atomic	2018-12-28 12:11:47 -08: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	tcp: Refactor pingpong code	2019-01-27 13:29:43 -08:00
trace.h	net: dccp: Add DCCP sendmsg trace event	2018-01-02 14:27:30 -05:00