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

Trivial conflict in net/core/filter.c, a locally computed
'sdif' is now an argument to the function.

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

2018-11-28 22:10:54 -08:00

..

associola.c

sctp: add subscribe per asoc

2018-11-19 12:25:43 -08:00

auth.c

treewide: kzalloc() -> kcalloc()

2018-06-12 16:19:22 -07:00

bind_addr.c

sctp: add sock_reuseport for the sock in __sctp_hash_endpoint

2018-11-12 09:09:51 -08:00

chunk.c

sctp: add subscribe per asoc

2018-11-19 12:25:43 -08:00

debug.c

…

diag.c

…

endpointola.c

treewide: Use struct_size() for kmalloc()-family

2018-06-06 11:15:43 -07:00

input.c

sctp: add sock_reuseport for the sock in __sctp_hash_endpoint

2018-11-12 09:09:51 -08:00

inqueue.c

…

ipv6.c

net: Convert protocol error handlers from void to int

2018-11-08 17:13:08 -08:00

Kconfig

sctp: whitespace fixes

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

Makefile

…

objcnt.c

proc: introduce proc_create_seq{,_data}

2018-05-16 07:23:35 +02:00

offload.c

…

output.c

sctp: increase sk_wmem_alloc when head->truesize is increased

2018-11-27 15:42:31 -08:00

outqueue.c

sctp: define SCTP_SS_DEFAULT for Stream schedulers

2018-11-03 19:40:29 -07:00

primitive.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

proc.c

sctp: remove useless start_fail from sctp_ht_iter in proc

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

protocol.c

mm: remove include/linux/bootmem.h

2018-10-31 08:54:16 -07:00

sm_make_chunk.c

…

sm_sideeffect.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

sm_statefuns.c

…

sm_statetable.c

sctp: rename enum sctp_event to sctp_event_type

2018-11-19 12:25:43 -08:00

socket.c

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

2018-11-24 17:01:43 -08:00

stream_interleave.c

sctp: add subscribe per asoc

2018-11-19 12:25:43 -08: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

sctp: not increase stream's incnt before sending addstrm_in request

2018-11-19 14:46:32 -08: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: add subscribe per asoc

2018-11-19 12:25:43 -08:00