projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 93d43e5 f85c159)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 May 2020 20:48:59 +0000 (13:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 May 2020 20:48:59 +0000 (13:48 -0700)
commitda07f52d3caf6c24c6dbffb5500f379d819e04bd
tree836e51994554f1aeddeebb6cb6ee568944a467e7tree | snapshot
parent93d43e58683efd958a0421b932a273df74e0e008commit | diff
parentf85c1598ddfe83f61d0656bd1d2025fa3b148b99commit | diff
Merge git://git./linux/kernel/git/netdev/net

Move the bpf verifier trace check into the new switch statement in
HEAD.

Resolve the overlapping changes in hinic, where bug fixes overlap
the addition of VF support.

Signed-off-by: David S. Miller <davem@davemloft.net>
37 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c diff1 | diff2 | blob | history
drivers/net/ethernet/huawei/hinic/hinic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/microchip/encx24j600.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_lif.c diff1 | diff2 | blob | history
drivers/net/ethernet/pensando/ionic/ionic_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/Kconfig diff1 | diff2 | blob | history
drivers/net/ethernet/ti/Makefile diff1 | diff2 | blob | history
drivers/net/hamradio/bpqether.c diff1 | diff2 | blob | history
drivers/net/ipa/ipa_cmd.c diff1 | diff2 | blob | history
drivers/net/phy/phy.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
include/linux/ftrace.h diff1 | diff2 | blob | history
include/linux/ptp_clock_kernel.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
kernel/bpf/arraymap.c diff1 | diff2 | blob | history
kernel/bpf/syscall.c diff1 | diff2 | blob | history
kernel/bpf/verifier.c diff1 | diff2 | blob | history
kernel/trace/bpf_trace.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
kernel/umh.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/filter.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/mptcp/protocol.c diff1 | diff2 | blob | history
net/mptcp/subflow.c diff1 | diff2 | blob | history
net/netfilter/nf_flow_table_offload.c diff1 | diff2 | blob | history
tools/lib/bpf/bpf_tracing.h diff1 | diff2 | blob | history
tools/testing/selftests/bpf/progs/test_overhead.c diff1 | diff2 | blob | history
Domain: System / Kernel;