Skip to contentSkip to conversation

Revert "net: micrel: fix KS8851_MLL Kconfig"

PATCH In review Marek Vasut 3 participants 5 messages Apr 25, 2022 – Apr 26, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "net: micrel: fix KS8851_MLL Kconfig"

This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .

Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Sasha Levin <[email protected]>
Cc <[email protected]> # 5.10.x
---
 drivers/net/ethernet/micrel/Kconfig | 1 -
 1 file changed, 1 deletion(-)
drivers/net/ethernet/micrel/Kconfig +0 -1
index 9ceb7e1fb169..42bc014136fe 100644
@@ -37,7 +37,6 @@ config KS8851
 config KS8851_MLL
 	tristate "Micrel KS8851 MLL"
 	depends on HAS_IOMEM
-	depends on PTP_1588_CLOCK_OPTIONAL
 	select MII
 	select CRC32
 	select EEPROM_93CX6
Signature · 1 line
2.35.1
#1 lore raw
Quoted 7 lines · Marek Vasut

This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .

Quoted 7 lines
Cc David S. Miller <[email protected]>
Cc Jakub Kicinski <[email protected]>
Cc Paolo Abeni <[email protected]>
Cc Randy Dunlap <[email protected]>
Cc Sasha Levin <[email protected]>
Cc <[email protected]> # 5.10.x

Ack. Thanks.

Quoted 16 lines
---
 drivers/net/ethernet/micrel/Kconfig | 1 -
 1 file changed, 1 deletion(-)
drivers/net/ethernet/micrel/Kconfig +0 -1
index 9ceb7e1fb169..42bc014136fe 100644
@@ -37,7 +37,6 @@ config KS8851
 config KS8851_MLL
 	tristate "Micrel KS8851 MLL"
 	depends on HAS_IOMEM
-	depends on PTP_1588_CLOCK_OPTIONAL
 	select MII
 	select CRC32
 	select EEPROM_93CX6
Signature · 1 line
~Randy
maintainer
#2 lore raw
In reply to Marek Vasut
Quoted 6 lines · Marek Vasut

This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .

As the original change went into 4.9.311, 4.14.276, 4.19.239, and 5.4.190, is this change also needed in those branches?

thanks,

greg k-h

maintainer
#3 lore raw
Quoted 10 lines · Greg KH
Quoted 6 lines · Marek Vasut

This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .

As the original change went into 4.9.311, 4.14.276, 4.19.239, and 5.4.190, is this change also needed in those branches?

The answer to that seems yes, so I'll go queue this up everywhere.

thanks,

greg k-h

#4 lore raw
Quoted 9 lines · Greg KH
Quoted 8 lines · Greg KH
Quoted 6 lines · Marek Vasut

This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125.

The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") which is not part of Linux 5.10.y . Revert the aforementioned commit to prevent breakage in 5.10.y .

Quoted 4 lines
Quoted 2 lines

As the original change went into 4.9.311, 4.14.276, 4.19.239, and 5.4.190, is this change also needed in those branches?

The answer to that seems yes, so I'll go queue this up everywhere.

Yes, agreed.

Signature · 1 line
~Randy