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

Conflicts:
	drivers/net/ethernet/chelsio/cxgb4vf/sge.c
	drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c

sge.c was overlapping two changes, one to use the new
__dev_alloc_page() in net-next, and one to use s->fl_pg_order in net.

ixgbe_phy.c was a set of overlapping whitespace changes.

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

2014-11-14 01:01:12 -05:00

..

associola.c

net: sctp: fix panic on duplicate ASCONF chunks

2014-10-14 12:46:22 -04:00

auth.c

net: sctp: fix memory leak in auth key management

2014-11-11 15:19:11 -05:00

bind_addr.c

sctp: Fix FSF address in file headers

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

chunk.c

sctp: fix checkpatch errors with space required or prohibited

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

debug.c

sctp: Fix FSF address in file headers

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

endpointola.c

net: sctp: migrate most recently used transport to ktime

2014-06-11 12:23:17 -07:00

input.c

sctp: Change sctp to implement csum_levels

2014-08-29 20:41:11 -07:00

inqueue.c

net: sctp: fix remote memory pressure from excessive queueing

2014-10-14 12:46:22 -04:00

ipv6.c

sctp: Fixup v4mapped behaviour to comply with Sock API

2014-07-31 21:49:06 -07:00

Kconfig

net: sctp: get rid of SCTP_DBG_TSNS entirely

2013-07-02 00:08:03 -07:00

Makefile

net: sctp: Inline the functions from command.c

2014-07-08 14:38:48 -07:00

objcnt.c

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

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

output.c

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

2014-08-05 18:46:26 -07:00

outqueue.c

net: sctp: Rename SCTP_XMIT_NAGLE_DELAY to SCTP_XMIT_DELAY

2014-07-22 13:32:11 -07:00

primitive.c

sctp: Fix FSF address in file headers

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

probe.c

sctp: loading sctp when load sctp_probe

2013-12-16 20:04:27 -05:00

proc.c

sctp: replace seq_printf with seq_puts

2014-10-30 19:40:16 -04:00

protocol.c

Merge branch 'for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-10 07:26:02 -04:00

sm_make_chunk.c

net: sctp: fix NULL pointer dereference in af->from_addr_param on malformed packet

2014-11-11 15:19:10 -05:00

sm_sideeffect.c

net: sctp: Don't transition to PF state when transport has exhausted 'Path.Max.Retrans'.

2014-04-27 23:41:14 -04:00

sm_statefuns.c

net: sctp: fix remote memory pressure from excessive queueing

2014-10-14 12:46:22 -04:00

sm_statetable.c

sctp: fix checkpatch errors with indent

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

socket.c

net: Add and use skb_copy_datagram_msg() helper.

2014-11-05 16:46:40 -05:00

ssnmap.c

sctp: Fix FSF address in file headers

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

sysctl.c

net: sctp: only warn in proc_sctp_do_alpha_beta if write

2014-07-02 18:44:07 -07:00

transport.c

sctp: Fixup v4mapped behaviour to comply with Sock API

2014-07-31 21:49:06 -07:00

tsnmap.c

sctp: Fix FSF address in file headers

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

ulpevent.c

sctp: Fixup v4mapped behaviour to comply with Sock API

2014-07-31 21:49:06 -07:00

ulpqueue.c

net: introduce SO_INCOMING_CPU

2014-11-11 13:00:06 -05:00