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

net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.

net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'.  Thanks to David
Ahern for the heads up.

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

2018-10-19 11:03:06 -07:00

..

associola.c

sctp: use the pmtu from the icmp packet to update transport pathmtu

2018-10-15 22:54:20 -07:00

auth.c

…

bind_addr.c

…

chunk.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

debug.c

…

diag.c

…

endpointola.c

…

input.c

sctp: use the pmtu from the icmp packet to update transport pathmtu

2018-10-15 22:54:20 -07:00

inqueue.c

…

ipv6.c

…

Kconfig

sctp: whitespace fixes

2018-07-24 14:10:42 -07:00

Makefile

…

objcnt.c

…

offload.c

…

output.c

sctp: use the pmtu from the icmp packet to update transport pathmtu

2018-10-15 22:54:20 -07:00

outqueue.c

sctp: count both sk and asoc sndbuf with skb truesize and sctp_chunk size

2018-10-18 11:23:47 -07:00

primitive.c

…

proc.c

sctp: remove useless start_fail from sctp_ht_iter in proc

2018-08-27 15:13:17 -07:00

protocol.c

…

sm_make_chunk.c

…

sm_sideeffect.c

sctp: whitespace fixes

2018-07-24 14:10:42 -07:00

sm_statefuns.c

…

sm_statetable.c

…

socket.c

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

2018-10-19 11:03:06 -07:00

stream_interleave.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream_sched_prio.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream_sched_rr.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream_sched.c

net/sctp: Make wrappers for accessing in/out streams

2018-08-11 12:25:15 -07:00

stream.c

net/sctp: Replace in/out stream arrays with flex_array

2018-08-11 12:25:15 -07:00

sysctl.c

…

transport.c

sctp: update dst pmtu with the correct daddr

2018-09-20 11:29:30 -07:00

tsnmap.c

…

ulpevent.c

…

ulpqueue.c

sctp: Use skb_queue_is_first().

2018-09-10 10:06:53 -07:00