From: Greg Kroah-Hartman Date: Tue, 26 Apr 2022 07:17:18 +0000 (+0200) Subject: patch text cleanups X-Git-Tag: v4.9.312~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b258a2ff4d052c2a3e85ae7183e762397a434ffa;p=thirdparty%2Fkernel%2Fstable-queue.git patch text cleanups --- diff --git a/queue-4.14/revert-net-micrel-fix-ks8851_mll-kconfig.patch b/queue-4.14/revert-net-micrel-fix-ks8851_mll-kconfig.patch index 410b9010d33..4ccd1d2b4fb 100644 --- a/queue-4.14/revert-net-micrel-fix-ks8851_mll-kconfig.patch +++ b/queue-4.14/revert-net-micrel-fix-ks8851_mll-kconfig.patch @@ -11,7 +11,7 @@ From: Marek Vasut This reverts commit 84ddee4ea320411fa038d4f1fd9a0161f989b482 which is commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream. -The upstream commit 84ddee4ea320 ("net: micrel: fix KS8851_MLL Kconfig") +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 4.14.y . Revert the aforementioned commit to prevent breakage in 4.14.y . @@ -22,9 +22,8 @@ Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Randy Dunlap Cc: Sasha Levin -Cc: # 5.10.x +Cc: Signed-off-by: Greg Kroah-Hartman - --- drivers/net/ethernet/micrel/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/queue-5.10/revert-net-micrel-fix-ks8851_mll-kconfig.patch b/queue-5.10/revert-net-micrel-fix-ks8851_mll-kconfig.patch index e3c8bb753ad..fe7eb50bf1f 100644 --- a/queue-5.10/revert-net-micrel-fix-ks8851_mll-kconfig.patch +++ b/queue-5.10/revert-net-micrel-fix-ks8851_mll-kconfig.patch @@ -8,7 +8,8 @@ Message-ID: <20220425214859.256650-1-marex@denx.de> From: Marek Vasut -This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125. +This reverts commit 1ff5359afa5ec0dd09fe76183dc4fa24b50e4125 which is +commit c3efcedd272aa6dd5929e20cf902a52ddaa1197a upstream. The upstream commit c3efcedd272a ("net: micrel: fix KS8851_MLL Kconfig") depends on e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies") @@ -23,7 +24,6 @@ Cc: Randy Dunlap Cc: Sasha Levin Cc: # 5.10.x Signed-off-by: Greg Kroah-Hartman - --- drivers/net/ethernet/micrel/Kconfig | 1 - 1 file changed, 1 deletion(-)