kernel_optimize_test/net/sctp
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
..
associola.c sctp: add sockopt SCTP_ENABLE_STREAM_RESET 2017-01-18 14:55:10 -05:00
auth.c
bind_addr.c sctp: not copying duplicate addrs to the assoc's bind address list 2016-12-20 14:15:45 -05:00
chunk.c sctp: refactor sctp_datamsg_from_user 2016-12-29 14:44:03 -05:00
debug.c net: sctp: fix array overrun read on sctp_timer_tbl 2017-01-24 15:24:35 -05:00
endpointola.c sctp: add reconf_enable in asoc ep and netns 2017-01-18 14:55:10 -05:00
input.c sctp: add pr_debug for tracking asocs not found 2016-12-28 14:26:17 -05:00
inqueue.c
ipv6.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-01-28 10:33:06 -05:00
Kconfig
Makefile sctp: prepare asoc stream for stream reconf 2017-01-06 21:07:26 -05:00
objcnt.c sctp: prepare asoc stream for stream reconf 2017-01-06 21:07:26 -05:00
offload.c sctp: sctp gso should set feature with NETIF_F_SG when calling skb_segment 2017-01-25 12:28:33 -05:00
output.c sctp: remove return value from sctp_packet_init/config 2016-12-28 14:06:31 -05:00
outqueue.c sctp: implement sender-side procedures for SSN Reset Request Parameter 2017-01-18 14:55:11 -05:00
primitive.c sctp: add stream reconf primitive 2017-01-18 14:55:10 -05:00
probe.c
proc.c
protocol.c sctp: add reconf_enable in asoc ep and netns 2017-01-18 14:55:10 -05:00
sctp_diag.c
sm_make_chunk.c sctp: add reconf_enable in asoc ep and netns 2017-01-18 14:55:10 -05:00
sm_sideeffect.c sctp: add stream reconf timer 2017-01-18 14:55:10 -05:00
sm_statefuns.c sctp: add stream reconf primitive 2017-01-18 14:55:10 -05:00
sm_statetable.c sctp: add stream reconf primitive 2017-01-18 14:55:10 -05:00
socket.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-01-28 10:33:06 -05:00
stream.c sctp: implement sender-side procedures for SSN Reset Request Parameter 2017-01-18 14:55:11 -05:00
sysctl.c
transport.c sctp: add stream reconf timer 2017-01-18 14:55:10 -05:00
tsnmap.c
ulpevent.c
ulpqueue.c sctp: prepare asoc stream for stream reconf 2017-01-06 21:07:26 -05:00