From 760c82b7de336c42044bb3d43ef3765bdae573e7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 25 Nov 2022 15:54:26 +0100 Subject: [PATCH] 5.10-stable patches added patches: revert-net-broadcom-fix-bcmgenet-kconfig.patch --- ...rt-net-broadcom-fix-bcmgenet-kconfig.patch | 42 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 queue-5.10/revert-net-broadcom-fix-bcmgenet-kconfig.patch diff --git a/queue-5.10/revert-net-broadcom-fix-bcmgenet-kconfig.patch b/queue-5.10/revert-net-broadcom-fix-bcmgenet-kconfig.patch new file mode 100644 index 00000000000..ca66104ca87 --- /dev/null +++ b/queue-5.10/revert-net-broadcom-fix-bcmgenet-kconfig.patch @@ -0,0 +1,42 @@ +From 9ba23155caabde2fdd993ccbc1da78e82236701f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Fri, 25 Nov 2022 15:51:06 +0100 +Subject: Revert "net: broadcom: Fix BCMGENET Kconfig" + +From: Greg Kroah-Hartman + +This reverts commit fbb4e8e6dc7b38b3007354700f03c8ad2d9a2118 which is +commit 8d820bc9d12b8beebca836cceaf2bbe68216c2f8 upstream. + +It causes runtime failures as reported by Naresh and Arnd writes: + + Greg, please just revert fbb4e8e6dc7b ("net: broadcom: Fix BCMGENET Kconfig") + in stable/linux-5.10.y: it depends on e5f31552674e ("ethernet: fix + PTP_1588_CLOCK dependencies"), which we probably don't want backported + from 5.15 to 5.10. + +So it should be reverted. + +Reported-by: Naresh Kamboju +Reported-by: Arnd Bergmann +Link: https://lore.kernel.org/r/CA+G9fYsXomPXcecPDzDydO3=i2qHDM2RTtGxr0p2YOS6=YcWng@mail.gmail.com +Cc: YueHaibing +Cc: Florian Fainelli +Cc: Jakub Kicinski +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/broadcom/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/broadcom/Kconfig ++++ b/drivers/net/ethernet/broadcom/Kconfig +@@ -69,7 +69,7 @@ config BCMGENET + select BCM7XXX_PHY + select MDIO_BCM_UNIMAC + select DIMLIB +- select BROADCOM_PHY if (ARCH_BCM2835 && PTP_1588_CLOCK_OPTIONAL) ++ select BROADCOM_PHY if ARCH_BCM2835 + help + This driver supports the built-in Ethernet MACs found in the + Broadcom BCM7xxx Set Top Box family chipset. diff --git a/queue-5.10/series b/queue-5.10/series index 655505dc396..95f16e72e25 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -145,3 +145,4 @@ mm-fs-initialize-fsdata-passed-to-write_begin-write_end-interface.patch ntfs-fix-use-after-free-in-ntfs_attr_find.patch ntfs-fix-out-of-bounds-read-in-ntfs_attr_find.patch ntfs-check-overflow-when-iterating-attr_records.patch +revert-net-broadcom-fix-bcmgenet-kconfig.patch -- 2.47.3