]> www.infradead.org Git - users/willy/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 30 Jun 2022 23:31:00 +0000 (16:31 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 30 Jun 2022 23:31:00 +0000 (16:31 -0700)
commit0d8730f07c822a351a624462918c7109cdc7f402
tree3539d4c7c098894f3b2d5f49134c8cfccc06aaca
parentb7d78b46d5e8dc77c656c13885d31e931923b915
parent5e8379351dbde61ea383e514f0f9ecb2c047cf4e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
  9c5de246c1db ("net: sparx5: mdb add/del handle non-sparx5 devices")
  fbb89d02e33a ("net: sparx5: Allow mdb entries to both CPU and ports")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
17 files changed:
MAINTAINERS
drivers/net/dsa/ocelot/felix_vsc9959.c
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
drivers/net/phy/phy_device.c
drivers/net/phy/sfp.c
drivers/net/usb/usbnet.c
include/linux/netdevice.h
include/linux/phy.h
kernel/trace/trace_uprobe.c
net/ipv4/tcp_ipv4.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/ipv6/sit.c
net/mptcp/protocol.c
net/mptcp/subflow.c
net/socket.c