From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 26 Apr 2022 07:17:06 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.9.312~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e1b9cadc367d876e2b1f10a89149eeaf3687b9a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	revert-net-micrel-fix-ks8851_mll-kconfig.patch
---

diff --git a/queue-5.4/revert-net-micrel-fix-ks8851_mll-kconfig.patch b/queue-5.4/revert-net-micrel-fix-ks8851_mll-kconfig.patch
new file mode 100644
index 00000000000..3b76bc88257
--- /dev/null
+++ b/queue-5.4/revert-net-micrel-fix-ks8851_mll-kconfig.patch
@@ -0,0 +1,40 @@
+From marex@denx.de  Tue Apr 26 09:09:57 2022
+From: Marek Vasut <marex@denx.de>
+Date: Mon, 25 Apr 2022 23:48:59 +0200
+Subject: Revert "net: micrel: fix KS8851_MLL Kconfig"
+To: stable@vger.kernel.org
+Cc: Marek Vasut <marex@denx.de>, "David S . Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Randy Dunlap <rdunlap@infradead.org>, Sasha Levin <sashal@kernel.org>
+Message-ID: <20220425214859.256650-1-marex@denx.de>
+
+From: Marek Vasut <marex@denx.de>
+
+This reverts commit 4cd3c9e070d6a9a9dc76a5ffa79114953bf69087 which is
+commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream.
+
+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.4.y . Revert the aforementioned commit to
+prevent breakage in 5.4.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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/micrel/Kconfig |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- 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
+ 	---help---
+ 	  This platform driver is for Micrel KS8851 Address/data bus
diff --git a/queue-5.4/series b/queue-5.4/series
index 1b60ce4af52..3f78352e8cc 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -59,3 +59,4 @@ jbd2-fix-a-potential-race-while-discarding-reserved-buffers-after-an-abort.patch
 spi-atmel-quadspi-fix-the-buswidth-adjustment-between-spi-mem-and-controller.patch
 staging-ion-prevent-incorrect-reference-counting-behavour.patch
 block-compat_ioctl-fix-range-check-in-blkgetsize.patch
+revert-net-micrel-fix-ks8851_mll-kconfig.patch