From 0de3ca75c1e21c4efb539c2ae6d4cfd6f958f83c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Feb 2024 09:41:24 +0100 Subject: [PATCH] drop net-ethernet-adi-requires-phylib-support.patch --- ...ethernet-adi-requires-phylib-support.patch | 70 ------------------- queue-6.1/series | 1 - ...ethernet-adi-requires-phylib-support.patch | 70 ------------------- queue-6.6/series | 1 - ...ethernet-adi-requires-phylib-support.patch | 70 ------------------- queue-6.7/series | 1 - 6 files changed, 213 deletions(-) delete mode 100644 queue-6.1/net-ethernet-adi-requires-phylib-support.patch delete mode 100644 queue-6.6/net-ethernet-adi-requires-phylib-support.patch delete mode 100644 queue-6.7/net-ethernet-adi-requires-phylib-support.patch diff --git a/queue-6.1/net-ethernet-adi-requires-phylib-support.patch b/queue-6.1/net-ethernet-adi-requires-phylib-support.patch deleted file mode 100644 index 0b074b09374..00000000000 --- a/queue-6.1/net-ethernet-adi-requires-phylib-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7c3bab1514e02cefe9ce458103a053030f09ef07 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Feb 2024 23:00:50 -0800 -Subject: net: ethernet: adi: requires PHYLIB support - -From: Randy Dunlap - -[ Upstream commit a9f80df4f51440303d063b55bb98720857693821 ] - -This driver uses functions that are supplied by the Kconfig symbol -PHYLIB, so select it to ensure that they are built as needed. - -When CONFIG_ADIN1110=y and CONFIG_PHYLIB=m, there are multiple build -(linker) errors that are resolved by this Kconfig change: - - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_open': - drivers/net/ethernet/adi/adin1110.c:933: undefined reference to `phy_start' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_probe_netdevs': - drivers/net/ethernet/adi/adin1110.c:1603: undefined reference to `get_phy_device' - ld: drivers/net/ethernet/adi/adin1110.c:1609: undefined reference to `phy_connect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `devm_mdiobus_alloc': - include/linux/phy.h:455: undefined reference to `devm_mdiobus_alloc_size' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_register_mdiobus': - drivers/net/ethernet/adi/adin1110.c:529: undefined reference to `__devm_mdiobus_register' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_stop': - drivers/net/ethernet/adi/adin1110.c:958: undefined reference to `phy_stop' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_adjust_link': - drivers/net/ethernet/adi/adin1110.c:1077: undefined reference to `phy_print_status' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_ioctl': - drivers/net/ethernet/adi/adin1110.c:790: undefined reference to `phy_do_ioctl' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf60): undefined reference to `phy_ethtool_get_link_ksettings' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf68): undefined reference to `phy_ethtool_set_link_ksettings' - -Fixes: bc93e19d088b ("net: ethernet: adi: Add ADIN1110 support") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/ -Cc: Lennart Franzen -Cc: Alexandru Tachici -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Reviewed-by: Nuno Sa -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/adi/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig -index da3bdd3025022..c91b4dcef4ec2 100644 ---- a/drivers/net/ethernet/adi/Kconfig -+++ b/drivers/net/ethernet/adi/Kconfig -@@ -7,6 +7,7 @@ config NET_VENDOR_ADI - bool "Analog Devices devices" - default y - depends on SPI -+ select PHYLIB - help - If you have a network (Ethernet) card belonging to this class, say Y. - --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 005412168b4..50eb189c19b 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -146,7 +146,6 @@ scsi-jazz_esp-only-build-if-scsi-core-is-builtin.patch net-bridge-switchdev-skip-mdb-replays-of-deferred-ev.patch net-bridge-switchdev-ensure-deferred-event-delivery-.patch dccp-tcp-unhash-sk-from-ehash-for-tb2-alloc-failure-.patch -net-ethernet-adi-requires-phylib-support.patch nouveau-fix-function-cast-warnings.patch x86-numa-fix-the-address-overlap-check-in-numa_fill_.patch x86-numa-fix-the-sort-compare-func-used-in-numa_fill.patch diff --git a/queue-6.6/net-ethernet-adi-requires-phylib-support.patch b/queue-6.6/net-ethernet-adi-requires-phylib-support.patch deleted file mode 100644 index fff8f48e795..00000000000 --- a/queue-6.6/net-ethernet-adi-requires-phylib-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From ff9d83046cef2d128fbaf5df814542303f07addc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Feb 2024 23:00:50 -0800 -Subject: net: ethernet: adi: requires PHYLIB support - -From: Randy Dunlap - -[ Upstream commit a9f80df4f51440303d063b55bb98720857693821 ] - -This driver uses functions that are supplied by the Kconfig symbol -PHYLIB, so select it to ensure that they are built as needed. - -When CONFIG_ADIN1110=y and CONFIG_PHYLIB=m, there are multiple build -(linker) errors that are resolved by this Kconfig change: - - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_open': - drivers/net/ethernet/adi/adin1110.c:933: undefined reference to `phy_start' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_probe_netdevs': - drivers/net/ethernet/adi/adin1110.c:1603: undefined reference to `get_phy_device' - ld: drivers/net/ethernet/adi/adin1110.c:1609: undefined reference to `phy_connect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `devm_mdiobus_alloc': - include/linux/phy.h:455: undefined reference to `devm_mdiobus_alloc_size' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_register_mdiobus': - drivers/net/ethernet/adi/adin1110.c:529: undefined reference to `__devm_mdiobus_register' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_stop': - drivers/net/ethernet/adi/adin1110.c:958: undefined reference to `phy_stop' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_adjust_link': - drivers/net/ethernet/adi/adin1110.c:1077: undefined reference to `phy_print_status' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_ioctl': - drivers/net/ethernet/adi/adin1110.c:790: undefined reference to `phy_do_ioctl' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf60): undefined reference to `phy_ethtool_get_link_ksettings' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf68): undefined reference to `phy_ethtool_set_link_ksettings' - -Fixes: bc93e19d088b ("net: ethernet: adi: Add ADIN1110 support") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/ -Cc: Lennart Franzen -Cc: Alexandru Tachici -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Reviewed-by: Nuno Sa -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/adi/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig -index da3bdd3025022..c91b4dcef4ec2 100644 ---- a/drivers/net/ethernet/adi/Kconfig -+++ b/drivers/net/ethernet/adi/Kconfig -@@ -7,6 +7,7 @@ config NET_VENDOR_ADI - bool "Analog Devices devices" - default y - depends on SPI -+ select PHYLIB - help - If you have a network (Ethernet) card belonging to this class, say Y. - --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 2de9b2079b3..5b1271a2efa 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -234,7 +234,6 @@ scsi-jazz_esp-only-build-if-scsi-core-is-builtin.patch net-bridge-switchdev-skip-mdb-replays-of-deferred-ev.patch net-bridge-switchdev-ensure-deferred-event-delivery-.patch dccp-tcp-unhash-sk-from-ehash-for-tb2-alloc-failure-.patch -net-ethernet-adi-requires-phylib-support.patch net-sched-act_mirred-create-function-tcf_mirred_to_d.patch net-sched-act_mirred-use-the-backlog-for-mirred-ingr.patch net-sched-act_mirred-don-t-override-retval-if-we-alr.patch diff --git a/queue-6.7/net-ethernet-adi-requires-phylib-support.patch b/queue-6.7/net-ethernet-adi-requires-phylib-support.patch deleted file mode 100644 index bbb6b26e753..00000000000 --- a/queue-6.7/net-ethernet-adi-requires-phylib-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 83ba69af58fd914e1cc7fc1f65f556088adbe9c7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 14 Feb 2024 23:00:50 -0800 -Subject: net: ethernet: adi: requires PHYLIB support - -From: Randy Dunlap - -[ Upstream commit a9f80df4f51440303d063b55bb98720857693821 ] - -This driver uses functions that are supplied by the Kconfig symbol -PHYLIB, so select it to ensure that they are built as needed. - -When CONFIG_ADIN1110=y and CONFIG_PHYLIB=m, there are multiple build -(linker) errors that are resolved by this Kconfig change: - - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_open': - drivers/net/ethernet/adi/adin1110.c:933: undefined reference to `phy_start' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_probe_netdevs': - drivers/net/ethernet/adi/adin1110.c:1603: undefined reference to `get_phy_device' - ld: drivers/net/ethernet/adi/adin1110.c:1609: undefined reference to `phy_connect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `devm_mdiobus_alloc': - include/linux/phy.h:455: undefined reference to `devm_mdiobus_alloc_size' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_register_mdiobus': - drivers/net/ethernet/adi/adin1110.c:529: undefined reference to `__devm_mdiobus_register' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_net_stop': - drivers/net/ethernet/adi/adin1110.c:958: undefined reference to `phy_stop' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_disconnect_phy': - drivers/net/ethernet/adi/adin1110.c:1226: undefined reference to `phy_disconnect' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_adjust_link': - drivers/net/ethernet/adi/adin1110.c:1077: undefined reference to `phy_print_status' - ld: drivers/net/ethernet/adi/adin1110.o: in function `adin1110_ioctl': - drivers/net/ethernet/adi/adin1110.c:790: undefined reference to `phy_do_ioctl' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf60): undefined reference to `phy_ethtool_get_link_ksettings' - ld: drivers/net/ethernet/adi/adin1110.o:(.rodata+0xf68): undefined reference to `phy_ethtool_set_link_ksettings' - -Fixes: bc93e19d088b ("net: ethernet: adi: Add ADIN1110 support") -Signed-off-by: Randy Dunlap -Reported-by: kernel test robot -Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/ -Cc: Lennart Franzen -Cc: Alexandru Tachici -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Reviewed-by: Nuno Sa -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/adi/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig -index da3bdd3025022..c91b4dcef4ec2 100644 ---- a/drivers/net/ethernet/adi/Kconfig -+++ b/drivers/net/ethernet/adi/Kconfig -@@ -7,6 +7,7 @@ config NET_VENDOR_ADI - bool "Analog Devices devices" - default y - depends on SPI -+ select PHYLIB - help - If you have a network (Ethernet) card belonging to this class, say Y. - --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 35e2eb346f2..6470dee29ee 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -257,7 +257,6 @@ scsi-jazz_esp-only-build-if-scsi-core-is-builtin.patch net-bridge-switchdev-skip-mdb-replays-of-deferred-ev.patch net-bridge-switchdev-ensure-deferred-event-delivery-.patch dccp-tcp-unhash-sk-from-ehash-for-tb2-alloc-failure-.patch -net-ethernet-adi-requires-phylib-support.patch net-sched-act_mirred-create-function-tcf_mirred_to_d.patch net-sched-act_mirred-use-the-backlog-for-mirred-ingr.patch net-sched-act_mirred-don-t-override-retval-if-we-alr.patch -- 2.47.2