David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three conflicts, one of which, for marvell10g.c is non-trivial and requires some follow-up from Heiner or someone else. The issue is that Heiner converted the marvell10g driver over to use the generic c45 code as much as possible. However, in 'net' a bug fix appeared which makes sure that a new local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0 is cleared. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-24 12:06:19 -08:00
..
associola.c	sctp: add SCTP_FUTURE_ASSOC for SCTP_PEER_ADDR_THLDS sockopt	2019-01-30 00:44:06 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-09 21:43:31 -08:00
debug.c	sctp: add SCTP_CID_I_DATA and SCTP_CID_I_FWD_TSN conversion in sctp_cname	2018-02-12 11:40:01 -05:00
diag.c	inet_diag: fix reporting cgroup classid and fallback to priority	2019-02-12 13:35:57 -05:00
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	sctp: fix the issue that the cookie-ack with auth can't get processed	2018-05-02 11:15:33 -04:00
ipv6.c	sctp: set flow sport from saddr only when it's 0	2019-01-24 18:13:57 -08:00
Kconfig	sctp: whitespace fixes	2018-07-24 14:10:42 -07:00
Makefile	sctp: rename sctp_diag.c as diag.c	2018-02-13 13:56:31 -05:00
objcnt.c	proc: introduce proc_create_seq{,_data}	2018-05-16 07:23:35 +02:00
offload.c	sctp: call gso_reset_checksum when computing checksum in sctp_gso_segment	2019-02-13 19:31:43 -05:00
output.c	sctp: increase sk_wmem_alloc when head->truesize is increased	2018-11-27 15:42:31 -08:00
outqueue.c	sctp: add SCTP_FUTURE_ASOC and SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER sockopt	2019-01-30 00:44:08 -08: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	sctp: set flow sport from saddr only when it's 0	2019-01-24 18:13:57 -08:00
sm_make_chunk.c	sctp: set chunk transport correctly when it's a new asoc	2019-01-24 18:13:57 -08:00
sm_sideeffect.c	sctp: rename enum sctp_event to sctp_event_type	2018-11-19 12:25:43 -08:00
sm_statefuns.c	sctp: delay the authentication for the duplicated cookie-echo chunk	2018-05-07 23:39:10 -04:00
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	2019-02-08 15:00:17 -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: set stream ext to NULL after freeing it in sctp_stream_outq_migrate	2019-02-13 19:33:44 -05:00
sysctl.c	sctp: support sysctl to allow users to use stream interleave	2017-12-15 13:52:22 -05:00
transport.c	sctp: don't compare hb_timer expire date before starting it	2019-02-22 11:11:54 -08:00
tsnmap.c	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpevent.c	sctp: remove sctp_chunk_put from fail_mark err path in sctp_ulpevent_make_rcvmsg	2018-05-10 17:48:36 -04:00
ulpqueue.c	sctp: add subscribe per asoc	2018-11-19 12:25:43 -08:00