6.1-stable patches

added patches:
	powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch

diff --git a/queue-6.1/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch b/queue-6.1/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
index dbef1b22ef814a435736515f4ffb450a6c9595dc..fcd1248b1435a34e8ccfb278fb55316d05afd011 100644 (file)
--- a/queue-6.1/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
+++ b/queue-6.1/bpf-events-use-prog-to-emit-ksymbol-event-for-main-p.patch
@@ -37,14 +37,12 @@ Reviewed-by: Jiri Olsa <jolsa@kernel.org>
 Link: https://lore.kernel.org/bpf/20240714065533.1112616-1-houtao@huaweicloud.com
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- kernel/events/core.c | 28 +++++++++++++---------------
- 1 file changed, 13 insertions(+), 15 deletions(-)
+ kernel/events/core.c |   26 ++++++++++++--------------
+ 1 file changed, 12 insertions(+), 14 deletions(-)
 
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index b8333b8e6a782..d92ee56a2a768 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -9097,21 +9097,19 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog,
+@@ -9123,21 +9123,19 @@ static void perf_event_bpf_emit_ksymbols
        bool unregister = type == PERF_BPF_EVENT_PROG_UNLOAD;
        int i;
  
@@ -56,18 +54,17 @@ index b8333b8e6a782..d92ee56a2a768 100644
 -      } else {
 -              for (i = 0; i < prog->aux->func_cnt; i++) {
 -                      struct bpf_prog *subprog = prog->aux->func[i];
--
++      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
++                         (u64)(unsigned long)prog->bpf_func,
++                         prog->jited_len, unregister,
++                         prog->aux->ksym.name);
+ 
 -                      perf_event_ksymbol(
 -                              PERF_RECORD_KSYMBOL_TYPE_BPF,
 -                              (u64)(unsigned long)subprog->bpf_func,
 -                              subprog->jited_len, unregister,
 -                              subprog->aux->ksym.name);
 -              }
-+      perf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,
-+                         (u64)(unsigned long)prog->bpf_func,
-+                         prog->jited_len, unregister,
-+                         prog->aux->ksym.name);
-+
 +      for (i = 1; i < prog->aux->func_cnt; i++) {
 +              struct bpf_prog *subprog = prog->aux->func[i];
 +
@@ -79,6 +76,3 @@ index b8333b8e6a782..d92ee56a2a768 100644
        }
  }
  
--- 
-2.43.0
-

diff --git a/queue-6.1/powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch b/queue-6.1/powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch
new file mode 100644 (file)
index 0000000..7a4edc6
--- /dev/null
+++ b/queue-6.1/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 <esben@geanix.com>
+Date: Thu, 30 May 2024 16:46:37 +0200
+Subject: powerpc/configs: Update defconfig with now user-visible CONFIG_FSL_IFC
+
+From: Esben Haabendal <esben@geanix.com>
+
+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 <esben@geanix.com>
+Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Link: https://msgid.link/20240530-fsl-ifc-config-v3-2-1fd2c3d233dd@geanix.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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-6.1/series b/queue-6.1/series
index 13f651e122517dfe9e3a29f253b7cf5ec5b13a7f..e891f43fff531b6f499d967f54f597c882059ed9 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -1,3 +1,4 @@
+powerpc-configs-update-defconfig-with-now-user-visible-config_fsl_ifc.patch
 spi-spi-microchip-core-fix-the-number-of-chip-select.patch
 spi-atmel-quadspi-add-missing-check-for-clk_prepare.patch
 edac-i10nm-make-skx_common.o-a-separate-module.patch
@@ -18,7 +19,6 @@ kernfs-fix-all-kernel-doc-warnings-and-multiple-typo.patch
 kernfs-convert-kernfs_path_from_node_locked-from-str.patch
 cgroup-cpuset-prevent-uaf-in-proc_cpuset_show.patch
 hwmon-adt7475-fix-default-duty-on-fan-is-disabled.patch
-block-mq-deadline-fix-the-tag-reservation-code.patch
 pwm-stm32-always-do-lazy-disabling.patch
 nvmet-auth-fix-nvmet_auth-hash-error-handling.patch
 drm-meson-fix-canvas-release-in-bind-function.patch