Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 17 Mar 2022 20:56:06 +0000 (13:56 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 17 Mar 2022 20:56:58 +0000 (13:56 -0700)
commite243f39685af1bd6d837fa7bff40c1afdf3eb7fa
tree61e9d9b74a0814f950a693ebe8061293e4960b1e
parent1abea24af42c35c6eb537e4402836e2cde2a5b13
parent551acdc3c3d2b6bc97f11e31dcf960bc36343bfc
Merge git://git./linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
15 files changed:
MAINTAINERS
drivers/net/dsa/microchip/ksz8795_spi.c
drivers/net/dsa/microchip/ksz9477_spi.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/intel/iavf/iavf_main.c
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mscc/ocelot_flower.c
drivers/net/wireless/ath/ath10k/wmi.c
net/dsa/dsa2.c
net/ipv6/ip6_output.c
net/netfilter/nf_conntrack_core.c
net/netfilter/nf_nat_core.c
net/netfilter/nf_tables_api.c
net/packet/af_packet.c