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
..
.gitignore	kbuild: trivial - remove trailing empty lines	2014-06-10 00:04:06 +02:00
devicetable-offsets.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
empty.c
file2alias.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-10-30 21:09:24 +09:00
Makefile	kbuild: Consolidate header generation from ASM offset information	2017-04-13 05:43:37 +09:00
mk_elfconfig.c	kbuild: trivial - remove trailing empty lines	2014-06-10 00:04:06 +02:00
modpost.c	Modules updates for v4.14	2017-09-13 11:28:19 -07:00
modpost.h	Avoid conflict with host definitions when cross-compiling	2015-08-20 14:55:54 +02:00
sumversion.c	kbuild: trivial - use tabs for code indent where possible	2014-06-10 14:00:53 +02:00