]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop some patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Jul 2026 13:51:28 +0000 (15:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Jul 2026 13:51:28 +0000 (15:51 +0200)
13 files changed:
queue-5.10/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch [deleted file]
queue-5.10/series
queue-5.15/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch [deleted file]
queue-5.15/series
queue-6.1/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch [deleted file]
queue-6.1/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch [deleted file]
queue-6.1/series
queue-6.12/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch [deleted file]
queue-6.12/series
queue-6.18/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch [deleted file]
queue-6.18/series
queue-6.6/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch [deleted file]
queue-6.6/series

diff --git a/queue-5.10/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch b/queue-5.10/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
deleted file mode 100644 (file)
index 97c57fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 Mon Sep 17 00:00:00 2001
-From: Robby Cai <robby.cai@nxp.com>
-Date: Fri, 19 Jun 2026 15:31:15 +0800
-Subject: reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ
-
-From: Robby Cai <robby.cai@nxp.com>
-
-commit 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 upstream.
-
-On i.MX8MQ, the MIPI CSI reset lines are active-low and not self-clearing.
-Writing '0' asserts reset and it remains asserted until explicitly
-deasserted by software.
-
-This driver previously treated the MIPI CSI reset signals as active-high,
-which led to incorrect reset assert/deassert sequencing. This issue was
-exposed by commit 6d79bb8fd2aa ("media: imx8mq-mipi-csi2: Explicitly
-release reset").
-
-Fix this by reflecting the correct reset polarity and ensuring proper
-reset handling.
-
-Fixes: c979dbf59987 ("reset: imx7: Add support for i.MX8MQ IP block variant")
-Cc: stable@vger.kernel.org # 6d79bb8fd2aa: media: imx8mq-mipi-csi2: Explicitly release reset
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Robby Cai <robby.cai@nxp.com>
-Reviewed-by: Guoniu Zhou <guoniu.zhou@oss.nxp.com>
-Reviewed-by: Frank Li <Frank.Li@nxp.com>
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/reset/reset-imx7.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/reset/reset-imx7.c
-+++ b/drivers/reset/reset-imx7.c
-@@ -236,6 +236,12 @@ static int imx8mq_reset_set(struct reset
-       case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
-       case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
-+      case IMX8MQ_RESET_MIPI_CSI1_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_ESC_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_ESC_RESET:
-       case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
index 409191fdde9ea02fd2dd8f1dfdaf0056ced7bbfc..354f05d46a77128ab99200e90727492b2a776afe 100644 (file)
@@ -539,7 +539,6 @@ llc-fix-sap-refcount-leak-when-creating-incoming-sockets.patch
 macsec-fix-promiscuity-refcount-leak-in-macsec_dev_open.patch
 memstick-ms_block-reject-a-card-that-reports-too-many-blocks.patch
 ipvs-fix-more-places-with-wrong-ipv6-transport-offsets.patch
-reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
 reset-sunxi-fix-memory-region-leak-on-ioremap-failure.patch
 powerpc-spufs-fix-out-of-bounds-access-in-spufs_mem_mmap_access.patch
 wifi-mac80211-free-ack-status-frame-on-tx-header-build-failure.patch
diff --git a/queue-5.15/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch b/queue-5.15/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
deleted file mode 100644 (file)
index 97c57fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 Mon Sep 17 00:00:00 2001
-From: Robby Cai <robby.cai@nxp.com>
-Date: Fri, 19 Jun 2026 15:31:15 +0800
-Subject: reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ
-
-From: Robby Cai <robby.cai@nxp.com>
-
-commit 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 upstream.
-
-On i.MX8MQ, the MIPI CSI reset lines are active-low and not self-clearing.
-Writing '0' asserts reset and it remains asserted until explicitly
-deasserted by software.
-
-This driver previously treated the MIPI CSI reset signals as active-high,
-which led to incorrect reset assert/deassert sequencing. This issue was
-exposed by commit 6d79bb8fd2aa ("media: imx8mq-mipi-csi2: Explicitly
-release reset").
-
-Fix this by reflecting the correct reset polarity and ensuring proper
-reset handling.
-
-Fixes: c979dbf59987 ("reset: imx7: Add support for i.MX8MQ IP block variant")
-Cc: stable@vger.kernel.org # 6d79bb8fd2aa: media: imx8mq-mipi-csi2: Explicitly release reset
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Robby Cai <robby.cai@nxp.com>
-Reviewed-by: Guoniu Zhou <guoniu.zhou@oss.nxp.com>
-Reviewed-by: Frank Li <Frank.Li@nxp.com>
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/reset/reset-imx7.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/reset/reset-imx7.c
-+++ b/drivers/reset/reset-imx7.c
-@@ -236,6 +236,12 @@ static int imx8mq_reset_set(struct reset
-       case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
-       case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
-+      case IMX8MQ_RESET_MIPI_CSI1_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_ESC_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_ESC_RESET:
-       case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
index 3c46735c487c83be9580bcfb49dcd23e6d5ae7c8..a48338268d68bda5387793304f924574d58166e3 100644 (file)
@@ -686,7 +686,6 @@ llc-fix-sap-refcount-leak-when-creating-incoming-sockets.patch
 macsec-fix-promiscuity-refcount-leak-in-macsec_dev_open.patch
 memstick-ms_block-reject-a-card-that-reports-too-many-blocks.patch
 ipvs-fix-more-places-with-wrong-ipv6-transport-offsets.patch
-reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
 reset-sunxi-fix-memory-region-leak-on-ioremap-failure.patch
 powerpc-spufs-fix-out-of-bounds-access-in-spufs_mem_mmap_access.patch
 wifi-mac80211-free-ack-status-frame-on-tx-header-build-failure.patch
diff --git a/queue-6.1/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch b/queue-6.1/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
deleted file mode 100644 (file)
index 97c57fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 Mon Sep 17 00:00:00 2001
-From: Robby Cai <robby.cai@nxp.com>
-Date: Fri, 19 Jun 2026 15:31:15 +0800
-Subject: reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ
-
-From: Robby Cai <robby.cai@nxp.com>
-
-commit 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 upstream.
-
-On i.MX8MQ, the MIPI CSI reset lines are active-low and not self-clearing.
-Writing '0' asserts reset and it remains asserted until explicitly
-deasserted by software.
-
-This driver previously treated the MIPI CSI reset signals as active-high,
-which led to incorrect reset assert/deassert sequencing. This issue was
-exposed by commit 6d79bb8fd2aa ("media: imx8mq-mipi-csi2: Explicitly
-release reset").
-
-Fix this by reflecting the correct reset polarity and ensuring proper
-reset handling.
-
-Fixes: c979dbf59987 ("reset: imx7: Add support for i.MX8MQ IP block variant")
-Cc: stable@vger.kernel.org # 6d79bb8fd2aa: media: imx8mq-mipi-csi2: Explicitly release reset
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Robby Cai <robby.cai@nxp.com>
-Reviewed-by: Guoniu Zhou <guoniu.zhou@oss.nxp.com>
-Reviewed-by: Frank Li <Frank.Li@nxp.com>
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/reset/reset-imx7.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/reset/reset-imx7.c
-+++ b/drivers/reset/reset-imx7.c
-@@ -236,6 +236,12 @@ static int imx8mq_reset_set(struct reset
-       case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
-       case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
-+      case IMX8MQ_RESET_MIPI_CSI1_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_ESC_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_ESC_RESET:
-       case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
diff --git a/queue-6.1/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch b/queue-6.1/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch
deleted file mode 100644 (file)
index aec0600..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 191f49f1e38b1c10eb44b0f967c6175c884ef7db Mon Sep 17 00:00:00 2001
-From: Alice Ryhl <aliceryhl@google.com>
-Date: Tue, 16 Jun 2026 12:30:38 +0000
-Subject: rust: Kbuild: set frame-pointer llvm module flag for CONFIG_FRAME_POINTER
-
-From: Alice Ryhl <aliceryhl@google.com>
-
-commit 191f49f1e38b1c10eb44b0f967c6175c884ef7db upstream.
-
-Due to a rustc bug, the -Cforce-frame-pointers=y flag only emits the
-frame-pointer annotation for functions, but not for the module. This
-means that functions generated by the LLVM backend such as
-'asan.module_ctor' do not receive the frame-pointer annotation.
-
-This is likely to lead to broken backtraces and may also cause issues
-with ftrace if these features are used with functions generated by the
-LLVM backend.
-
-Thus, use -Zllvm_module_flag to work around this rustc bug if using a
-rustc without the fix.
-
-[ The fix [1] has landed for Rust 1.98.0 (expected release on
-  2026-08-20). - Miguel ]
-
-Cc: stable@vger.kernel.org # 6.12.y and later (flag not available in pinned Rust in older LTSs).
-Fixes: 2f7ab1267dc9 ("Kbuild: add Rust support")
-Link: https://github.com/rust-lang/rust/pull/156980 [1]
-Signed-off-by: Alice Ryhl <aliceryhl@google.com>
-Link: https://patch.msgid.link/20260616-frame-ptr-fix-v1-1-dc6b29a631d9@google.com
-[ - Adjusted Cc: stable@ as discussed.
-  - Added comment with link to the PR, similar to what we did in commit
-    ac35b5580ace ("rust: arm64: set uwtable llvm module flag for
-    CONFIG_UNWIND_TABLES").
-    - Miguel ]
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/Makefile
-+++ b/Makefile
-@@ -904,6 +904,9 @@ KBUILD_CFLAGS += $(call cc-disable-warni
- ifdef CONFIG_FRAME_POINTER
- KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
- KBUILD_RUSTFLAGS += -Cforce-frame-pointers=y
-+# Work around rustc bug on compilers without
-+# https://github.com/rust-lang/rust/pull/156980.
-+KBUILD_RUSTFLAGS += $(if $(call rustc-min-version,109800),,-Zllvm_module_flag=frame-pointer:u32:2:max)
- else
- # Some targets (ARM with Thumb2, for example), can't be built with frame
- # pointers.  For those, we don't have FUNCTION_TRACER automatically
index 27bcbfec82f0bad4c698d98880d33740580d3996..121fe99765a9ef4eb8502f952762ff5ce1871f61 100644 (file)
@@ -44,7 +44,6 @@ eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch
 eventpoll-move-epi_fget-up.patch
 eventpoll-fix-ep_remove-struct-eventpoll-struct-file-uaf.patch
 acpi-cppc-suppress-ubsan-warning-caused-by-field-misuse.patch
-rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch
 virtio_net-support-dynamic-rss-indirection-table-siz.patch
 mips-smp-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
 usb-gadget-function-rndis-add-length-check-to-response-query.patch
@@ -889,7 +888,6 @@ llc-fix-sap-refcount-leak-when-creating-incoming-sockets.patch
 macsec-fix-promiscuity-refcount-leak-in-macsec_dev_open.patch
 memstick-ms_block-reject-a-card-that-reports-too-many-blocks.patch
 ipvs-fix-more-places-with-wrong-ipv6-transport-offsets.patch
-reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
 reset-sunxi-fix-memory-region-leak-on-ioremap-failure.patch
 powerpc-spufs-fix-out-of-bounds-access-in-spufs_mem_mmap_access.patch
 wifi-mac80211-free-ack-status-frame-on-tx-header-build-failure.patch
diff --git a/queue-6.12/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch b/queue-6.12/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
deleted file mode 100644 (file)
index 97c57fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 Mon Sep 17 00:00:00 2001
-From: Robby Cai <robby.cai@nxp.com>
-Date: Fri, 19 Jun 2026 15:31:15 +0800
-Subject: reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ
-
-From: Robby Cai <robby.cai@nxp.com>
-
-commit 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 upstream.
-
-On i.MX8MQ, the MIPI CSI reset lines are active-low and not self-clearing.
-Writing '0' asserts reset and it remains asserted until explicitly
-deasserted by software.
-
-This driver previously treated the MIPI CSI reset signals as active-high,
-which led to incorrect reset assert/deassert sequencing. This issue was
-exposed by commit 6d79bb8fd2aa ("media: imx8mq-mipi-csi2: Explicitly
-release reset").
-
-Fix this by reflecting the correct reset polarity and ensuring proper
-reset handling.
-
-Fixes: c979dbf59987 ("reset: imx7: Add support for i.MX8MQ IP block variant")
-Cc: stable@vger.kernel.org # 6d79bb8fd2aa: media: imx8mq-mipi-csi2: Explicitly release reset
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Robby Cai <robby.cai@nxp.com>
-Reviewed-by: Guoniu Zhou <guoniu.zhou@oss.nxp.com>
-Reviewed-by: Frank Li <Frank.Li@nxp.com>
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/reset/reset-imx7.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/reset/reset-imx7.c
-+++ b/drivers/reset/reset-imx7.c
-@@ -236,6 +236,12 @@ static int imx8mq_reset_set(struct reset
-       case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
-       case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
-+      case IMX8MQ_RESET_MIPI_CSI1_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_ESC_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_ESC_RESET:
-       case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
index a9b951b34c50f6cd5169958fbc4db7176f7a149a..82bcc29c5117853e3df6ef35813f29ccb44e46c5 100644 (file)
@@ -1050,7 +1050,6 @@ macsec-fix-promiscuity-refcount-leak-in-macsec_dev_open.patch
 memstick-ms_block-reject-a-card-that-reports-too-many-blocks.patch
 ipvs-fix-more-places-with-wrong-ipv6-transport-offsets.patch
 ipvs-reload-ip-header-after-head-reallocation.patch
-reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
 reset-sunxi-fix-memory-region-leak-on-ioremap-failure.patch
 powerpc-spufs-fix-out-of-bounds-access-in-spufs_mem_mmap_access.patch
 wifi-mac80211-free-ack-status-frame-on-tx-header-build-failure.patch
diff --git a/queue-6.18/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch b/queue-6.18/reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
deleted file mode 100644 (file)
index 97c57fc..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 Mon Sep 17 00:00:00 2001
-From: Robby Cai <robby.cai@nxp.com>
-Date: Fri, 19 Jun 2026 15:31:15 +0800
-Subject: reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ
-
-From: Robby Cai <robby.cai@nxp.com>
-
-commit 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 upstream.
-
-On i.MX8MQ, the MIPI CSI reset lines are active-low and not self-clearing.
-Writing '0' asserts reset and it remains asserted until explicitly
-deasserted by software.
-
-This driver previously treated the MIPI CSI reset signals as active-high,
-which led to incorrect reset assert/deassert sequencing. This issue was
-exposed by commit 6d79bb8fd2aa ("media: imx8mq-mipi-csi2: Explicitly
-release reset").
-
-Fix this by reflecting the correct reset polarity and ensuring proper
-reset handling.
-
-Fixes: c979dbf59987 ("reset: imx7: Add support for i.MX8MQ IP block variant")
-Cc: stable@vger.kernel.org # 6d79bb8fd2aa: media: imx8mq-mipi-csi2: Explicitly release reset
-Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Robby Cai <robby.cai@nxp.com>
-Reviewed-by: Guoniu Zhou <guoniu.zhou@oss.nxp.com>
-Reviewed-by: Frank Li <Frank.Li@nxp.com>
-Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/reset/reset-imx7.c |    6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/reset/reset-imx7.c
-+++ b/drivers/reset/reset-imx7.c
-@@ -236,6 +236,12 @@ static int imx8mq_reset_set(struct reset
-       case IMX8MQ_RESET_PCIE_CTRL_APPS_EN:
-       case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN:
-+      case IMX8MQ_RESET_MIPI_CSI1_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI1_ESC_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_CORE_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_PHY_REF_RESET:
-+      case IMX8MQ_RESET_MIPI_CSI2_ESC_RESET:
-       case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N:
-       case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N:
index 59fa3ac432c795a93032d29d54bfeee942f77044..f5750b2a125fac3587a7f8d101dfcaa842c509ef 100644 (file)
@@ -1505,7 +1505,6 @@ macsec-fix-promiscuity-refcount-leak-in-macsec_dev_open.patch
 memstick-ms_block-reject-a-card-that-reports-too-many-blocks.patch
 ipvs-fix-more-places-with-wrong-ipv6-transport-offsets.patch
 ipvs-reload-ip-header-after-head-reallocation.patch
-reset-imx7-correct-polarity-of-mipi-csi-resets-on-i.mx8mq.patch
 reset-sunxi-fix-memory-region-leak-on-ioremap-failure.patch
 powerpc-spufs-fix-out-of-bounds-access-in-spufs_mem_mmap_access.patch
 wifi-cfg80211-validate-eht-mle-before-mld-id-read.patch
diff --git a/queue-6.6/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch b/queue-6.6/rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch
deleted file mode 100644 (file)
index f039a4c..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 191f49f1e38b1c10eb44b0f967c6175c884ef7db Mon Sep 17 00:00:00 2001
-From: Alice Ryhl <aliceryhl@google.com>
-Date: Tue, 16 Jun 2026 12:30:38 +0000
-Subject: rust: Kbuild: set frame-pointer llvm module flag for CONFIG_FRAME_POINTER
-
-From: Alice Ryhl <aliceryhl@google.com>
-
-commit 191f49f1e38b1c10eb44b0f967c6175c884ef7db upstream.
-
-Due to a rustc bug, the -Cforce-frame-pointers=y flag only emits the
-frame-pointer annotation for functions, but not for the module. This
-means that functions generated by the LLVM backend such as
-'asan.module_ctor' do not receive the frame-pointer annotation.
-
-This is likely to lead to broken backtraces and may also cause issues
-with ftrace if these features are used with functions generated by the
-LLVM backend.
-
-Thus, use -Zllvm_module_flag to work around this rustc bug if using a
-rustc without the fix.
-
-[ The fix [1] has landed for Rust 1.98.0 (expected release on
-  2026-08-20). - Miguel ]
-
-Cc: stable@vger.kernel.org # 6.12.y and later (flag not available in pinned Rust in older LTSs).
-Fixes: 2f7ab1267dc9 ("Kbuild: add Rust support")
-Link: https://github.com/rust-lang/rust/pull/156980 [1]
-Signed-off-by: Alice Ryhl <aliceryhl@google.com>
-Link: https://patch.msgid.link/20260616-frame-ptr-fix-v1-1-dc6b29a631d9@google.com
-[ - Adjusted Cc: stable@ as discussed.
-  - Added comment with link to the PR, similar to what we did in commit
-    ac35b5580ace ("rust: arm64: set uwtable llvm module flag for
-    CONFIG_UNWIND_TABLES").
-    - Miguel ]
-Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- Makefile |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/Makefile
-+++ b/Makefile
-@@ -857,6 +857,9 @@ KBUILD_RUSTFLAGS += $(KBUILD_RUSTFLAGS-y
- ifdef CONFIG_FRAME_POINTER
- KBUILD_CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
- KBUILD_RUSTFLAGS += -Cforce-frame-pointers=y
-+# Work around rustc bug on compilers without
-+# https://github.com/rust-lang/rust/pull/156980.
-+KBUILD_RUSTFLAGS += $(if $(call rustc-min-version,109800),,-Zllvm_module_flag=frame-pointer:u32:2:max)
- else
- # Some targets (ARM with Thumb2, for example), can't be built with frame
- # pointers.  For those, we don't have FUNCTION_TRACER automatically
index e3b3c0fc7fbdc12aebe91e2d44d11481e7015139..316d1eb2c0621574f0a7d4d0b01f00895d575497 100644 (file)
@@ -60,7 +60,6 @@ bluetooth-iso-copy-base-if-service-data-matches-eir_.patch
 perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
 acpi-cppc-suppress-ubsan-warning-caused-by-field-misuse.patch
 acpi-nfit-core-fix-possible-null-pointer-dereference.patch
-rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch
 perf-core-detach-event-groups-during-remove_on_exec.patch
 revert-crypto-talitos-rename-first-last-to-first_des.patch
 revert-crypto-talitos-fix-sec1-32k-ahash-request-lim.patch