Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 9 Dec 2021 20:04:19 +0000 (12:04 -0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 9 Dec 2021 21:23:02 +0000 (13:23 -0800)
commit3150a73366b64e3109f0facbc98bcacbc14e81ba
tree2b94b32c5fe97a4e76058a6f65e8c5717b53ee16
parent1a2fb220edca98d18f90e3ef5bd6853a6b22b1b8
parentded746bfc94398d2ee9de315a187677b207b2004
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
28 files changed:
MAINTAINERS
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/ocelot/felix.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/iavf/iavf_ethtool.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
drivers/net/ethernet/qlogic/qede/qede_fp.c
drivers/net/phy/phylink.c
drivers/net/vrf.c
drivers/net/wwan/iosm/iosm_ipc_imem.c
drivers/net/wwan/iosm/iosm_ipc_imem.h
drivers/net/wwan/iosm/iosm_ipc_imem_ops.c
include/linux/bpf.h
include/linux/filter.h
include/linux/phy.h
kernel/bpf/btf.c
kernel/bpf/verifier.c
lib/Kconfig.debug
net/core/devlink.c
net/core/neighbour.c
net/ethtool/netlink.c
net/ipv4/inet_connection_sock.c
net/ipv4/udp.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_conntrack_netlink.c
tools/testing/selftests/net/fcnal-test.sh