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
..
Kconfig	net: Default UDP and UNIX diag to 'n'.	2012-01-07 12:13:06 -08:00
Makefile	unix_diag: Write it into kbuild	2011-12-16 13:48:29 -05:00
af_unix.c	net: af_unix: mark expected switch fall-through	2017-10-22 03:07:50 +01:00
diag.c	net/unix: don't show information about sockets from other namespaces	2017-10-26 10:05:59 +09:00
garbage.c	net: unix: properly re-increment inflight counter of GC discarded candidates	2017-03-21 15:25:10 -07:00
sysctl_net_unix.c	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00