From: Greg Kroah-Hartman Date: Sun, 16 Jul 2023 15:08:25 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.39~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecfdeab703c3f724f7cc6e15b97b834ba454438d;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch --- diff --git a/queue-6.1/mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch b/queue-6.1/mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch new file mode 100644 index 00000000000..92335aff646 --- /dev/null +++ b/queue-6.1/mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch @@ -0,0 +1,41 @@ +From 085679b15b5af65f9610f619afde41da0f966194 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Wed, 16 Nov 2022 13:49:32 +0100 +Subject: mtd: parsers: refer to ARCH_BCMBCA instead of ARCH_BCM4908 + +From: Lukas Bulwahn + +commit 085679b15b5af65f9610f619afde41da0f966194 upstream. + +Commit dd5c672d7ca9 ("arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA") +removes config ARCH_BCM4908 as config ARCH_BCMBCA has the same intent. + +Probably due to concurrent development, commit 002181f5b150 ("mtd: parsers: +add Broadcom's U-Boot parser") introduces 'Broadcom's U-Boot partition +parser' that depends on ARCH_BCM4908, but this use was not visible during +the config refactoring from the commit above. Hence, these two changes +create a reference to a non-existing config symbol. + +Adjust the MTD_BRCM_U_BOOT definition to refer to ARCH_BCMBCA instead of +ARCH_BCM4908 to remove the reference to the non-existing config symbol +ARCH_BCM4908. + +Signed-off-by: Lukas Bulwahn +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20221116124932.4748-1-lukas.bulwahn@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/parsers/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mtd/parsers/Kconfig ++++ b/drivers/mtd/parsers/Kconfig +@@ -22,7 +22,7 @@ config MTD_BCM63XX_PARTS + + config MTD_BRCM_U_BOOT + tristate "Broadcom's U-Boot partition parser" +- depends on ARCH_BCM4908 || COMPILE_TEST ++ depends on ARCH_BCMBCA || COMPILE_TEST + help + Broadcom uses a custom way of storing U-Boot environment variables. + They are placed inside U-Boot partition itself at unspecified offset. diff --git a/queue-6.1/series b/queue-6.1/series index 1200d2e1157..9ca21c4083e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -591,3 +591,4 @@ mm-mmap-fix-extra-maple-tree-write.patch drm-i915-fix-typec-mode-initialization-during-system-resume.patch drm-i915-tc-fix-tc-port-link-ref-init-for-dp-mst-during-hw-readout.patch drm-i915-tc-fix-system-resume-mst-mode-restore-for-dp-alt-sinks.patch +mtd-parsers-refer-to-arch_bcmbca-instead-of-arch_bcm4908.patch