From: Greg Kroah-Hartman Date: Wed, 31 Jul 2024 06:13:45 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v6.1.103~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=710122bcb9dd2c060cf7dbf0b19f5345c701b112;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch --- diff --git a/queue-5.15/powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch b/queue-5.15/powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch new file mode 100644 index 00000000000..7a4edc6a17c --- /dev/null +++ b/queue-5.15/powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch @@ -0,0 +1,41 @@ +From 45547a0a93d85f704b49788cde2e1d9ab9cd363b Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Thu, 30 May 2024 16:46:37 +0200 +Subject: powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC + +From: Esben Haabendal + +commit 45547a0a93d85f704b49788cde2e1d9ab9cd363b upstream. + +With CONFIG_FSL_IFC now being user-visible, and thus changed from a select +to depends in CONFIG_MTD_NAND_FSL_IFC, the dependencies needs to be +selected in defconfigs. + +Depends-on: 9ba0cae3cac0 ("memory: fsl_ifc: Make FSL_IFC config visible and selectable") +Signed-off-by: Esben Haabendal +Reviewed-by: Krzysztof Kozlowski +Signed-off-by: Michael Ellerman +Link: https://msgid.link/20240530-fsl-ifc-config-v3-2-1fd2c3d233dd@geanix.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/powerpc/configs/85xx-hw.config | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/powerpc/configs/85xx-hw.config ++++ b/arch/powerpc/configs/85xx-hw.config +@@ -24,6 +24,7 @@ CONFIG_FS_ENET=y + CONFIG_FSL_CORENET_CF=y + CONFIG_FSL_DMA=y + CONFIG_FSL_HV_MANAGER=y ++CONFIG_FSL_IFC=y + CONFIG_FSL_PQ_MDIO=y + CONFIG_FSL_RIO=y + CONFIG_FSL_XGMAC_MDIO=y +@@ -58,6 +59,7 @@ CONFIG_INPUT_FF_MEMLESS=m + CONFIG_MARVELL_PHY=y + CONFIG_MDIO_BUS_MUX_GPIO=y + CONFIG_MDIO_BUS_MUX_MMIOREG=y ++CONFIG_MEMORY=y + CONFIG_MMC_SDHCI_OF_ESDHC=y + CONFIG_MMC_SDHCI_PLTFM=y + CONFIG_MMC_SDHCI=y diff --git a/queue-5.15/series b/queue-5.15/series index f6f7bd3643d..81d1e8a955f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -302,3 +302,4 @@ nvme-split-command-copy-into-a-helper.patch nvme-separate-command-prep-and-issue.patch nvme-pci-add-missing-condition-check-for-existence-o.patch fs-don-t-allow-non-init-s_user_ns-for-filesystems-wi.patch +powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch