]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcf844fe0c7d632ce28c36e0bc529ac54539ad145
tree836e51994554f1aeddeebb6cb6ee568944a467e7
parent8c95a824d86c3daf143724129eb631c280217423
parentcd46beb6c446c9d62fe4fd8ece64c860652ec42d
Merge git://git.kernel.org/pub/scm/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
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h
drivers/net/ethernet/freescale/dpaa2/dpaa2-ethtool.c
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c
drivers/net/ethernet/huawei/hinic/hinic_main.c
drivers/net/ethernet/microchip/encx24j600.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/pensando/ionic/ionic_main.c
drivers/net/ethernet/realtek/r8169_main.c
drivers/net/ethernet/ti/Kconfig
drivers/net/ethernet/ti/Makefile
drivers/net/hamradio/bpqether.c
drivers/net/ipa/ipa_cmd.c
drivers/net/phy/phy.c
drivers/net/virtio_net.c
include/linux/ftrace.h
include/linux/ptp_clock_kernel.h
include/net/tcp.h
kernel/bpf/arraymap.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
kernel/trace/bpf_trace.c
kernel/trace/trace.c
kernel/umh.c
mm/page_alloc.c
net/core/dev.c
net/core/filter.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv6/route.c
net/mptcp/protocol.c
net/mptcp/subflow.c
net/netfilter/nf_flow_table_offload.c
tools/lib/bpf/bpf_tracing.h
tools/testing/selftests/bpf/progs/test_overhead.c