Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 12 Aug 2018 00:52:00 +0000 (17:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 12 Aug 2018 00:52:00 +0000 (17:52 -0700)
commit6a92ef08a1351e4977d6acde2196fa94e9c3a660
tree3f237980c08af76beae04a6844ad254543ca4b9f
parent9a95d9c6429bb58905fdfc95da2e1b7cc3fb55b7
parentec0c96714e7ddeda4eccaa077f5646a0fd6e371f
Merge ra./pub/scm/linux/kernel/git/davem/net
MAINTAINERS
drivers/net/ethernet/ti/cpsw.c
drivers/net/xen-netfront.c
kernel/bpf/sockmap.c
samples/bpf/xdp_redirect_cpu_kern.c
tools/lib/bpf/btf.c
tools/lib/bpf/btf.h