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

Conflicts:
	drivers/net/ethernet/mediatek/mtk_eth_soc.c
	drivers/net/ethernet/qlogic/qed/qed_dcbx.c
	drivers/net/phy/Kconfig

All conflicts were cases of overlapping commits.

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

2016-09-12 15:52:44 -07:00

..

associola.c

sctp: add SCTP_PR_SUPPORTED on sctp sockopt

2016-07-11 13:25:38 -07:00

auth.c

sctp: use IS_ENABLED() instead of checking for built-in or module

2016-09-10 21:19:11 -07:00

bind_addr.c

sctp: fix copying more bytes than expected in sctp_add_bind_addr

2016-03-08 15:04:08 -05:00

chunk.c

sctp: implement prsctp PRIO policy

2016-07-11 13:25:39 -07:00

debug.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

endpointola.c

sctp: add SCTP_PR_SUPPORTED on sctp sockopt

2016-07-11 13:25:38 -07:00

input.c

sctp: linearize early if it's not GSO

2016-08-19 17:09:42 -07:00

inqueue.c

sctp: linearize early if it's not GSO

2016-08-19 17:09:42 -07:00

ipv6.c

sctp: use inet_recvmsg to support sctp RFS well

2016-07-25 10:56:28 -07:00

Kconfig

sctp: add the sctp_diag.c file

2016-04-15 17:29:36 -04:00

Makefile

sctp: Add GSO support

2016-06-03 19:37:21 -04:00

objcnt.c

sctp: fix checkpatch errors with (foo*)|foo * bar|foo* bar

2013-12-26 13:47:47 -05:00

offload.c

sctp: fix GSO for IPv6

2016-07-16 22:02:09 -07:00

output.c

sctp: identify chunks that need to be fragmented at IP level

2016-09-09 19:18:33 -07:00

outqueue.c

sctp: implement prsctp PRIO policy

2016-07-11 13:25:39 -07:00

primitive.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

probe.c

net: sctp: Convert log timestamps to be y2038 safe

2016-03-01 17:18:44 -05:00

proc.c

net/sctp: always initialise sctp_ht_iter::start_fail

2016-08-13 15:10:16 -07:00

protocol.c

sctp: use inet_recvmsg to support sctp RFS well

2016-07-25 10:56:28 -07:00

sctp_diag.c

net: inet: diag: expose the socket mark to privileged processes.

2016-09-08 16:13:09 -07:00

sm_make_chunk.c

sctp: avoid identifying address family many times for a chunk

2016-07-13 18:10:14 -07:00

sm_sideeffect.c

sctp: sctp should change socket state when shutdown is received

2016-06-10 23:21:23 -07:00

sm_statefuns.c

sctp: only check for ECN if peer is using it

2016-07-13 18:10:14 -07:00

sm_statetable.c

sctp: fix checkpatch errors with indent

2013-12-26 13:47:48 -05:00

socket.c

sctp: allow receiving msg when TCP-style sk is in CLOSED state

2016-07-30 22:06:22 -07:00

ssnmap.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

sysctl.c

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

2016-01-11 23:55:43 -05:00

transport.c

sctp: avoid refreshing heartbeat timer too often

2016-04-10 22:22:34 -04:00

tsnmap.c

sctp: Fix FSF address in file headers

2013-12-06 12:37:56 -05:00

ulpevent.c

sctp: use event->chunk when it's valid

2016-08-08 14:31:23 -07:00

ulpqueue.c

sctp: allow delivering notifications after receiving SHUTDOWN

2016-07-30 22:06:22 -07:00