Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 27 May 2021 16:22:11 +0000 (09:22 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 27 May 2021 16:55:10 +0000 (09:55 -0700)
commit5ada57a9a6b0be0e6dfcbd4afa519b0347fd5649
treef82f466df9272bb0c385320b25adc51c45309f84
parent59c56342459a483d5e563ed8b5fdb77ab7622a73
parentd7c5303fbc8ac874ae3e597a5a0d3707dc0230b4
Merge git://git./linux/kernel/git/netdev/net

cdc-wdm: s/kill_urbs/poison_urbs/ to fix build

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
25 files changed:
MAINTAINERS
drivers/net/appletalk/cops.c
drivers/net/bonding/bond_main.c
drivers/net/dsa/mt7530.c
drivers/net/dsa/sja1105/sja1105_main.c
drivers/net/ethernet/broadcom/bnx2.c
drivers/net/ethernet/fujitsu/fmvj18x_cs.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
drivers/net/usb/hso.c
drivers/usb/class/cdc-wdm.c
kernel/bpf/btf.c
kernel/bpf/syscall.c
kernel/bpf/verifier.c
net/core/dev.c
net/core/filter.c
net/packet/af_packet.c
net/sched/cls_api.c
net/tls/tls_sw.c
tools/bpf/bpftool/prog.c
tools/lib/bpf/libbpf.c
tools/lib/bpf/libbpf_internal.h
tools/testing/selftests/bpf/prog_tests/ringbuf.c