kernel: move accepted patch to backport directory
authorAleksander Jan Bajkowski <[email protected]>
Mon, 22 Sep 2025 18:46:04 +0000 (20:46 +0200)
committerHauke Mehrtens <[email protected]>
Tue, 23 Sep 2025 20:12:34 +0000 (22:12 +0200)
This patch has already been accepted and landed in 6.17.

Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20132
Signed-off-by: Hauke Mehrtens <[email protected]>
target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch [new file with mode: 0644]
target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch [new file with mode: 0644]
target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch [deleted file]
target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch [deleted file]

diff --git a/target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch b/target/linux/generic/backport-6.12/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch
new file mode 100644 (file)
index 0000000..dedb5b1
--- /dev/null
@@ -0,0 +1,28 @@
+From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001
+From: Aleksander Jan Bajkowski <[email protected]>
+Date: Sun, 31 Aug 2025 12:59:07 +0200
+Subject: net: sfp: add quirk for FLYPRO copper SFP+ module
+
+Add quirk for a copper SFP that identifies itself as "FLYPRO"
+"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY.
+
+Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
+Reviewed-by: Russell King (Oracle) <[email protected]>
+Link: https://patch.msgid.link/[email protected]
+Signed-off-by: Jakub Kicinski <[email protected]>
+---
+ drivers/net/phy/sfp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/phy/sfp.c
++++ b/drivers/net/phy/sfp.c
+@@ -474,6 +474,9 @@ static const struct sfp_quirk sfp_quirks
+       SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
+                 sfp_fixup_nokia),
++      // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY.
++      SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball),
++
+       // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball
+       // protocol to talk to the PHY and needs 4 sec wait before probing the
+       // PHY.
diff --git a/target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch b/target/linux/generic/backport-6.6/787-v6.17-net-sfp-add-quirk-for-FLYPRO-copper-SFP-module.patch
new file mode 100644 (file)
index 0000000..a155d4a
--- /dev/null
@@ -0,0 +1,28 @@
+From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001
+From: Aleksander Jan Bajkowski <[email protected]>
+Date: Sun, 31 Aug 2025 12:59:07 +0200
+Subject: net: sfp: add quirk for FLYPRO copper SFP+ module
+
+Add quirk for a copper SFP that identifies itself as "FLYPRO"
+"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY.
+
+Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
+Reviewed-by: Russell King (Oracle) <[email protected]>
+Link: https://patch.msgid.link/[email protected]
+Signed-off-by: Jakub Kicinski <[email protected]>
+---
+ drivers/net/phy/sfp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/phy/sfp.c
++++ b/drivers/net/phy/sfp.c
+@@ -459,6 +459,9 @@ static const struct sfp_quirk sfp_quirks
+       SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
+                 sfp_fixup_long_startup),
++      // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY.
++      SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball),
++
+       // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball
+       // protocol to talk to the PHY and needs 4 sec wait before probing the
+       // PHY.
diff --git a/target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch b/target/linux/generic/pending-6.12/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch
deleted file mode 100644 (file)
index dedb5b1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001
-From: Aleksander Jan Bajkowski <[email protected]>
-Date: Sun, 31 Aug 2025 12:59:07 +0200
-Subject: net: sfp: add quirk for FLYPRO copper SFP+ module
-
-Add quirk for a copper SFP that identifies itself as "FLYPRO"
-"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY.
-
-Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
-Reviewed-by: Russell King (Oracle) <[email protected]>
-Link: https://patch.msgid.link/[email protected]
-Signed-off-by: Jakub Kicinski <[email protected]>
----
- drivers/net/phy/sfp.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -474,6 +474,9 @@ static const struct sfp_quirk sfp_quirks
-       SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
-                 sfp_fixup_nokia),
-+      // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY.
-+      SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball),
-+
-       // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball
-       // protocol to talk to the PHY and needs 4 sec wait before probing the
-       // PHY.
diff --git a/target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch b/target/linux/generic/pending-6.6/750-net-sfp-add-quirk-for-FlyPro-10Gbase-T-module.patch
deleted file mode 100644 (file)
index a155d4a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From ddbf0e78a8b20ec18d314d31336a0230fdc9b394 Mon Sep 17 00:00:00 2001
-From: Aleksander Jan Bajkowski <[email protected]>
-Date: Sun, 31 Aug 2025 12:59:07 +0200
-Subject: net: sfp: add quirk for FLYPRO copper SFP+ module
-
-Add quirk for a copper SFP that identifies itself as "FLYPRO"
-"SFP-10GT-CS-30M". It uses RollBall protocol to talk to the PHY.
-
-Signed-off-by: Aleksander Jan Bajkowski <[email protected]>
-Reviewed-by: Russell King (Oracle) <[email protected]>
-Link: https://patch.msgid.link/[email protected]
-Signed-off-by: Jakub Kicinski <[email protected]>
----
- drivers/net/phy/sfp.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/phy/sfp.c
-+++ b/drivers/net/phy/sfp.c
-@@ -459,6 +459,9 @@ static const struct sfp_quirk sfp_quirks
-       SFP_QUIRK("ALCATELLUCENT", "3FE46541AA", sfp_quirk_2500basex,
-                 sfp_fixup_long_startup),
-+      // FLYPRO SFP-10GT-CS-30M uses Rollball protocol to talk to the PHY.
-+      SFP_QUIRK_F("FLYPRO", "SFP-10GT-CS-30M", sfp_fixup_rollball),
-+
-       // Fiberstore SFP-10G-T doesn't identify as copper, uses the Rollball
-       // protocol to talk to the PHY and needs 4 sec wait before probing the
-       // PHY.