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
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-22 13:39:14 +01:00
bpf: remove redundant variable old_flags
2017-10-11 20:22:34 -07:00
bpf: permit multiple bpf attachments for a single perf event
2017-10-25 10:47:47 +09:00
bpf: cpumap fix potential lost wake-up problem
2017-10-24 18:40:22 +09:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-22 13:39:14 +01:00
bpf: move instruction printing into a separate file
2017-10-10 12:30:16 -07:00
bpf: move instruction printing into a separate file
2017-10-10 12:30:16 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-22 13:39:14 +01:00
bpf: Add file mode configuration into bpf maps
2017-10-20 13:32:59 +01:00
bpf: Add file mode configuration into bpf maps
2017-10-20 13:32:59 +01:00
bpf: introduce new bpf cpu map type BPF_MAP_TYPE_CPUMAP
2017-10-18 12:12:18 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-30 21:09:24 +09:00
bpf: Add file mode configuration into bpf maps
2017-10-20 13:32:59 +01:00
selinux: bpf: Add addtional check for bpf object file receive
2017-10-20 13:32:59 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2017-10-22 13:39:14 +01:00
e1ea2f9856