]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 11 Feb 2022 01:29:56 +0000 (17:29 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 11 Feb 2022 01:29:56 +0000 (17:29 -0800)
commit733b37dd491710ae90c732f0c309596957c98de2
treeed284edec0db783dfa80366ae8df078b02f35be9
parentcd13e36a8d0ed1c26d2db7a177a1b8fb02d6245a
parent6c381580c972fe9d41642ff01ecdf71c140e0825
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
21 files changed:
MAINTAINERS
drivers/net/dsa/bcm_sf2.c
drivers/net/dsa/mt7530.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/qca/ar9331.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/net/ethernet/intel/ice/ice.h
drivers/net/ethernet/intel/ice/ice_common.c
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
net/dsa/dsa2.c
net/ipv4/ipmr.c
net/ipv4/tcp.c
net/ipv6/ip6mr.c
net/mptcp/pm_netlink.c
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nft_exthdr.c
tools/testing/selftests/net/mptcp/mptcp_join.sh