David S. Miller e1ea2f9856 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Several conflicts here. NFP driver bug fix adding nfp_netdev_is_nfp_repr() check to nfp_fl_output() needed some adjustments because the code block is in an else block now. Parallel additions to net/pkt_cls.h and net/sch_generic.h A bug fix in __tcp_retransmit_skb() conflicted with some of the rbtree changes in net-next. The tc action RCU callback fixes in 'net' had some overlap with some of the recent tcf_block reworking. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-10-30 21:09:24 +09:00
..
auth.h	net, sctp: convert sctp_auth_bytes.refcnt from atomic_t to refcount_t	2017-07-04 22:35:18 +01:00
checksum.h	include/net/: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
command.h	sctp: remove the typedef sctp_verb_t	2017-08-11 10:02:44 -07:00
constants.h	sctp: remove the typedef sctp_subtype_t	2017-08-06 21:33:42 -07:00
sctp.h	sctp: fix an use-after-free issue in sctp_sock_dump	2017-09-15 14:47:49 -07:00
sm.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
stream_sched.h	sctp: introduce stream scheduler foundations	2017-10-03 16:27:29 -07:00
structs.h	sctp: introduce round robin stream scheduler	2017-10-03 16:27:29 -07:00
tsnmap.h	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00
ulpevent.h	sctp: fix some type cast warnings introduced by stream reconf	2017-10-29 18:03:24 +09:00
ulpqueue.h	sctp: Fix FSF address in file headers	2013-12-06 12:37:56 -05:00