drop 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 (file)
index 0b074b0..0000000
--- 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 <sashal@kernel.org>
-Date: Wed, 14 Feb 2024 23:00:50 -0800
-Subject: net: ethernet: adi: requires PHYLIB support
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-[ 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 <rdunlap@infradead.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/
-Cc: Lennart Franzen <lennart@lfdomain.com>
-Cc: Alexandru Tachici <alexandru.tachici@analog.com>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Reviewed-by: Nuno Sa <nuno.sa@analog.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 005412168b4f5e9117222cb8d6346045413e3f18..50eb189c19b0a9c2b425798ad3cfb52fc4ae74e2 100644 (file)
--- 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 (file)
index fff8f48..0000000
--- 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 <sashal@kernel.org>
-Date: Wed, 14 Feb 2024 23:00:50 -0800
-Subject: net: ethernet: adi: requires PHYLIB support
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-[ 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 <rdunlap@infradead.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/
-Cc: Lennart Franzen <lennart@lfdomain.com>
-Cc: Alexandru Tachici <alexandru.tachici@analog.com>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Reviewed-by: Nuno Sa <nuno.sa@analog.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 2de9b2079b3f1d238939946050334efeb5ee578e..5b1271a2efafb902ab77160a1370ad7355fc971a 100644 (file)
--- 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 (file)
index bbb6b26..0000000
--- 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 <sashal@kernel.org>
-Date: Wed, 14 Feb 2024 23:00:50 -0800
-Subject: net: ethernet: adi: requires PHYLIB support
-
-From: Randy Dunlap <rdunlap@infradead.org>
-
-[ 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 <rdunlap@infradead.org>
-Reported-by: kernel test robot <lkp@intel.com>
-Closes: https://lore.kernel.org/oe-kbuild-all/202402070626.eZsfVHG5-lkp@intel.com/
-Cc: Lennart Franzen <lennart@lfdomain.com>
-Cc: Alexandru Tachici <alexandru.tachici@analog.com>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: Eric Dumazet <edumazet@google.com>
-Cc: Jakub Kicinski <kuba@kernel.org>
-Cc: Paolo Abeni <pabeni@redhat.com>
-Cc: netdev@vger.kernel.org
-Reviewed-by: Nuno Sa <nuno.sa@analog.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 35e2eb346f22e9c119db4c5213629a4f059b2260..6470dee29eeb24908043ce23764875c91997dcba 100644 (file)
--- 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