* [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig"
@ 2022-04-25 21:48 Marek Vasut
2022-04-25 21:57 ` Randy Dunlap
2022-04-26 6:37 ` Greg KH
0 siblings, 2 replies; 5+ messages in thread
From: Marek Vasut @ 2022-04-25 21:48 UTC (permalink / raw)
To: stable
Cc: Marek Vasut, David S . Miller, Jakub Kicinski, Paolo Abeni,
Randy Dunlap, Sasha Levin
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 .
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: <stable@vger.kernel.org> # 5.10.x
---
drivers/net/ethernet/micrel/Kconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
index 9ceb7e1fb169..42bc014136fe 100644
--- a/drivers/net/ethernet/micrel/Kconfig
+++ b/drivers/net/ethernet/micrel/Kconfig
@@ -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
--
2.35.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig"
2022-04-25 21:48 [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig" Marek Vasut
@ 2022-04-25 21:57 ` Randy Dunlap
2022-04-26 6:37 ` Greg KH
1 sibling, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2022-04-25 21:57 UTC (permalink / raw)
To: Marek Vasut, stable
Cc: David S . Miller, Jakub Kicinski, Paolo Abeni, Sasha Levin
On 4/25/22 14:48, Marek Vasut wrote:
> 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 .
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Cc: Sasha Levin <sashal@kernel.org>
> Cc: <stable@vger.kernel.org> # 5.10.x
Ack. Thanks.
> ---
> drivers/net/ethernet/micrel/Kconfig | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig
> index 9ceb7e1fb169..42bc014136fe 100644
> --- a/drivers/net/ethernet/micrel/Kconfig
> +++ b/drivers/net/ethernet/micrel/Kconfig
> @@ -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
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig"
2022-04-25 21:48 [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig" Marek Vasut
2022-04-25 21:57 ` Randy Dunlap
@ 2022-04-26 6:37 ` Greg KH
2022-04-26 7:09 ` Greg KH
1 sibling, 1 reply; 5+ messages in thread
From: Greg KH @ 2022-04-26 6:37 UTC (permalink / raw)
To: Marek Vasut
Cc: stable, David S . Miller, Jakub Kicinski, Paolo Abeni,
Randy Dunlap, Sasha Levin
On Mon, Apr 25, 2022 at 11:48:59PM +0200, Marek Vasut wrote:
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig"
2022-04-26 6:37 ` Greg KH
@ 2022-04-26 7:09 ` Greg KH
2022-04-26 14:38 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2022-04-26 7:09 UTC (permalink / raw)
To: Marek Vasut
Cc: stable, David S . Miller, Jakub Kicinski, Paolo Abeni,
Randy Dunlap, Sasha Levin
On Tue, Apr 26, 2022 at 08:37:30AM +0200, Greg KH wrote:
> On Mon, Apr 25, 2022 at 11:48:59PM +0200, Marek Vasut wrote:
> > 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig"
2022-04-26 7:09 ` Greg KH
@ 2022-04-26 14:38 ` Randy Dunlap
0 siblings, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2022-04-26 14:38 UTC (permalink / raw)
To: Greg KH, Marek Vasut
Cc: stable, David S . Miller, Jakub Kicinski, Paolo Abeni, Sasha Levin
On 4/26/22 00:09, Greg KH wrote:
> On Tue, Apr 26, 2022 at 08:37:30AM +0200, Greg KH wrote:
>> On Mon, Apr 25, 2022 at 11:48:59PM +0200, Marek Vasut wrote:
>>> 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.
Yes, agreed.
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-04-26 14:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-25 21:48 [PATCH] Revert "net: micrel: fix KS8851_MLL Kconfig" Marek Vasut
2022-04-25 21:57 ` Randy Dunlap
2022-04-26 6:37 ` Greg KH
2022-04-26 7:09 ` Greg KH
2022-04-26 14:38 ` Randy Dunlap
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.