From: Jakub Kicinski Date: Fri, 9 Dec 2022 00:07:53 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=837e8ac871499d337212e2161c046f5adf1bad33;p=users%2Fjedix%2Flinux-maple.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net No conflicts. Signed-off-by: Jakub Kicinski --- 837e8ac871499d337212e2161c046f5adf1bad33 diff --cc drivers/net/ethernet/microchip/sparx5/sparx5_main.c index f8382d3124e0,b6bbb3c9bd7a..d25f4f09faa0 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c @@@ -920,9 -911,9 +922,10 @@@ static int mchp_sparx5_remove(struct pl sparx5_ptp_deinit(sparx5); sparx5_fdma_stop(sparx5); sparx5_cleanup_ports(sparx5); + sparx5_vcap_destroy(sparx5); /* Unregister netdevs */ sparx5_unregister_notifier_blocks(sparx5); + destroy_workqueue(sparx5->mact_queue); return 0; } diff --cc drivers/net/phy/mxl-gpy.c index 0ff7ef076072,cae24091fb6f..147d7a5a9b35 --- a/drivers/net/phy/mxl-gpy.c +++ b/drivers/net/phy/mxl-gpy.c @@@ -78,9 -68,17 +79,17 @@@ VSPEC1_SGMII_CTRL_ANRS) /* Temperature sensor */ -#define VPSPEC1_TEMP_STA 0x0E -#define VPSPEC1_TEMP_STA_DATA GENMASK(9, 0) +#define VSPEC1_TEMP_STA 0x0E +#define VSPEC1_TEMP_STA_DATA GENMASK(9, 0) + /* Mailbox */ + #define VSPEC1_MBOX_DATA 0x5 + #define VSPEC1_MBOX_ADDRLO 0x6 + #define VSPEC1_MBOX_CMD 0x7 + #define VSPEC1_MBOX_CMD_ADDRHI GENMASK(7, 0) + #define VSPEC1_MBOX_CMD_RD (0 << 8) + #define VSPEC1_MBOX_CMD_READY BIT(15) + /* WoL */ #define VPSPEC2_WOL_CTL 0x0E06 #define VPSPEC2_WOL_AD01 0x0E08 diff --cc tools/testing/selftests/net/.gitignore index ee38ca888244,ff8fe93f679c..9cc84114741d --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@@ -1,7 -1,7 +1,8 @@@ # SPDX-License-Identifier: GPL-2.0-only bind_bhash +csum cmsg_sender + diag_uid fin_ack_lat gro hwtstamp_config