From: Sasha Levin <sashal@kernel.org>
Date: Sat, 4 Jul 2026 11:52:11 +0000 (-0400)
Subject: merge staging into queue: 7.1 6.18 6.12 6.6 6.1 5.15 5.10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e5aae1d3c35bcd1a337753a5419021ba7638e2e;p=thirdparty%2Fkernel%2Fstable-queue.git

merge staging into queue: 7.1 6.18 6.12 6.6 6.1 5.15 5.10
---

diff --git a/staging-5.10/clk-imx-add-check-for-kcalloc.patch b/queue-5.10/clk-imx-add-check-for-kcalloc.patch
similarity index 100%
rename from staging-5.10/clk-imx-add-check-for-kcalloc.patch
rename to queue-5.10/clk-imx-add-check-for-kcalloc.patch
diff --git a/staging-5.10/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-5.10/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-5.10/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-5.10/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-5.10/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch b/queue-5.10/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
similarity index 100%
rename from staging-5.10/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
rename to queue-5.10/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
diff --git a/staging-5.10/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch b/queue-5.10/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
similarity index 100%
rename from staging-5.10/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
rename to queue-5.10/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
diff --git a/staging-5.10/series b/queue-5.10/series
similarity index 100%
rename from staging-5.10/series
rename to queue-5.10/series
diff --git a/staging-5.10/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-5.10/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-5.10/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-5.10/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-5.15/clk-imx-add-check-for-kcalloc.patch b/queue-5.15/clk-imx-add-check-for-kcalloc.patch
similarity index 100%
rename from staging-5.15/clk-imx-add-check-for-kcalloc.patch
rename to queue-5.15/clk-imx-add-check-for-kcalloc.patch
diff --git a/staging-5.15/nfc-llcp-protect-nfc_llcp_sock_unlink-calls.patch b/queue-5.15/nfc-llcp-protect-nfc_llcp_sock_unlink-calls.patch
similarity index 100%
rename from staging-5.15/nfc-llcp-protect-nfc_llcp_sock_unlink-calls.patch
rename to queue-5.15/nfc-llcp-protect-nfc_llcp_sock_unlink-calls.patch
diff --git a/staging-5.15/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-5.15/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-5.15/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-5.15/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-5.15/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch b/queue-5.15/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
similarity index 100%
rename from staging-5.15/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
rename to queue-5.15/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
diff --git a/staging-5.15/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch b/queue-5.15/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
similarity index 100%
rename from staging-5.15/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
rename to queue-5.15/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
diff --git a/staging-5.15/series b/queue-5.15/series
similarity index 100%
rename from staging-5.15/series
rename to queue-5.15/series
diff --git a/staging-5.15/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-5.15/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-5.15/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-5.15/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-6.1/bpf-arm64-reject-out-of-range-b.cond-targets.patch b/queue-6.1/bpf-arm64-reject-out-of-range-b.cond-targets.patch
similarity index 100%
rename from staging-6.1/bpf-arm64-reject-out-of-range-b.cond-targets.patch
rename to queue-6.1/bpf-arm64-reject-out-of-range-b.cond-targets.patch
diff --git a/staging-6.1/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch b/queue-6.1/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
similarity index 100%
rename from staging-6.1/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
rename to queue-6.1/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
diff --git a/staging-6.1/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-6.1/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-6.1/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-6.1/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-6.1/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch b/queue-6.1/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
similarity index 100%
rename from staging-6.1/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
rename to queue-6.1/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
diff --git a/staging-6.1/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch b/queue-6.1/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
similarity index 100%
rename from staging-6.1/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
rename to queue-6.1/nvmet-tcp-fix-race-between-icreq-handling-and-queue-.patch
diff --git a/staging-6.1/series b/queue-6.1/series
similarity index 100%
rename from staging-6.1/series
rename to queue-6.1/series
diff --git a/staging-6.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-6.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-6.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-6.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-6.12/bpf-arm64-reject-out-of-range-b.cond-targets.patch b/queue-6.12/bpf-arm64-reject-out-of-range-b.cond-targets.patch
similarity index 100%
rename from staging-6.12/bpf-arm64-reject-out-of-range-b.cond-targets.patch
rename to queue-6.12/bpf-arm64-reject-out-of-range-b.cond-targets.patch
diff --git a/staging-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch
similarity index 100%
rename from staging-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch
rename to queue-6.12/kernel-fork-clear-pf_block_ts-in-copy_process.patch
diff --git a/staging-6.12/nfsd-fix-file-change-detection-in-cb_getattr.patch b/queue-6.12/nfsd-fix-file-change-detection-in-cb_getattr.patch
similarity index 100%
rename from staging-6.12/nfsd-fix-file-change-detection-in-cb_getattr.patch
rename to queue-6.12/nfsd-fix-file-change-detection-in-cb_getattr.patch
diff --git a/staging-6.12/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-6.12/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-6.12/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-6.12/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-6.12/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch b/queue-6.12/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
similarity index 100%
rename from staging-6.12/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
rename to queue-6.12/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
diff --git a/staging-6.12/series b/queue-6.12/series
similarity index 100%
rename from staging-6.12/series
rename to queue-6.12/series
diff --git a/staging-6.12/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-6.12/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-6.12/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-6.12/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-6.18/bpf-arm64-reject-out-of-range-b.cond-targets.patch b/queue-6.18/bpf-arm64-reject-out-of-range-b.cond-targets.patch
similarity index 100%
rename from staging-6.18/bpf-arm64-reject-out-of-range-b.cond-targets.patch
rename to queue-6.18/bpf-arm64-reject-out-of-range-b.cond-targets.patch
diff --git a/staging-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch
similarity index 100%
rename from staging-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch
rename to queue-6.18/kernel-fork-clear-pf_block_ts-in-copy_process.patch
diff --git a/staging-6.18/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-6.18/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-6.18/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-6.18/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-6.18/nfsd-update-mtime-ctime-on-clone-in-presense-of-dele.patch b/queue-6.18/nfsd-update-mtime-ctime-on-clone-in-presense-of-dele.patch
similarity index 100%
rename from staging-6.18/nfsd-update-mtime-ctime-on-clone-in-presense-of-dele.patch
rename to queue-6.18/nfsd-update-mtime-ctime-on-clone-in-presense-of-dele.patch
diff --git a/staging-6.18/nfsd-update-mtime-ctime-on-copy-in-presence-of-deleg.patch b/queue-6.18/nfsd-update-mtime-ctime-on-copy-in-presence-of-deleg.patch
similarity index 100%
rename from staging-6.18/nfsd-update-mtime-ctime-on-copy-in-presence-of-deleg.patch
rename to queue-6.18/nfsd-update-mtime-ctime-on-copy-in-presence-of-deleg.patch
diff --git a/staging-6.18/rust-str-clean-unused-import-for-rust-1.98.patch b/queue-6.18/rust-str-clean-unused-import-for-rust-1.98.patch
similarity index 100%
rename from staging-6.18/rust-str-clean-unused-import-for-rust-1.98.patch
rename to queue-6.18/rust-str-clean-unused-import-for-rust-1.98.patch
diff --git a/staging-6.18/rust-str-use-the-kernel-vertical-imports-style.patch b/queue-6.18/rust-str-use-the-kernel-vertical-imports-style.patch
similarity index 100%
rename from staging-6.18/rust-str-use-the-kernel-vertical-imports-style.patch
rename to queue-6.18/rust-str-use-the-kernel-vertical-imports-style.patch
diff --git a/staging-6.18/series b/queue-6.18/series
similarity index 100%
rename from staging-6.18/series
rename to queue-6.18/series
diff --git a/staging-6.18/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-6.18/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-6.18/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-6.18/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-6.6/bluetooth-btmtk-apply-the-common-btmtk_fw_get_filena.patch b/queue-6.6/bluetooth-btmtk-apply-the-common-btmtk_fw_get_filena.patch
similarity index 100%
rename from staging-6.6/bluetooth-btmtk-apply-the-common-btmtk_fw_get_filena.patch
rename to queue-6.6/bluetooth-btmtk-apply-the-common-btmtk_fw_get_filena.patch
diff --git a/staging-6.6/bluetooth-btmtk-fix-btmtk.c-undefined-reference-buil.patch b/queue-6.6/bluetooth-btmtk-fix-btmtk.c-undefined-reference-buil.patch
similarity index 100%
rename from staging-6.6/bluetooth-btmtk-fix-btmtk.c-undefined-reference-buil.patch
rename to queue-6.6/bluetooth-btmtk-fix-btmtk.c-undefined-reference-buil.patch
diff --git a/staging-6.6/bluetooth-btmtk-fix-failed-to-send-func-ctrl-for-med.patch b/queue-6.6/bluetooth-btmtk-fix-failed-to-send-func-ctrl-for-med.patch
similarity index 100%
rename from staging-6.6/bluetooth-btmtk-fix-failed-to-send-func-ctrl-for-med.patch
rename to queue-6.6/bluetooth-btmtk-fix-failed-to-send-func-ctrl-for-med.patch
diff --git a/staging-6.6/bluetooth-btmtk-fix-wait_on_bit_timeout-interruption.patch b/queue-6.6/bluetooth-btmtk-fix-wait_on_bit_timeout-interruption.patch
similarity index 100%
rename from staging-6.6/bluetooth-btmtk-fix-wait_on_bit_timeout-interruption.patch
rename to queue-6.6/bluetooth-btmtk-fix-wait_on_bit_timeout-interruption.patch
diff --git a/staging-6.6/bluetooth-btmtk-move-btusb_mtk_-setup-shutdown-to-bt.patch b/queue-6.6/bluetooth-btmtk-move-btusb_mtk_-setup-shutdown-to-bt.patch
similarity index 100%
rename from staging-6.6/bluetooth-btmtk-move-btusb_mtk_-setup-shutdown-to-bt.patch
rename to queue-6.6/bluetooth-btmtk-move-btusb_mtk_-setup-shutdown-to-bt.patch
diff --git a/staging-6.6/bluetooth-btusb-mediatek-add-mt7922-subsystem-reset.patch b/queue-6.6/bluetooth-btusb-mediatek-add-mt7922-subsystem-reset.patch
similarity index 100%
rename from staging-6.6/bluetooth-btusb-mediatek-add-mt7922-subsystem-reset.patch
rename to queue-6.6/bluetooth-btusb-mediatek-add-mt7922-subsystem-reset.patch
diff --git a/staging-6.6/bluetooth-btusb-mediatek-remove-the-unnecessary-goto.patch b/queue-6.6/bluetooth-btusb-mediatek-remove-the-unnecessary-goto.patch
similarity index 100%
rename from staging-6.6/bluetooth-btusb-mediatek-remove-the-unnecessary-goto.patch
rename to queue-6.6/bluetooth-btusb-mediatek-remove-the-unnecessary-goto.patch
diff --git a/staging-6.6/bluetooth-btusb-mediatek-reset-the-controller-before.patch b/queue-6.6/bluetooth-btusb-mediatek-reset-the-controller-before.patch
similarity index 100%
rename from staging-6.6/bluetooth-btusb-mediatek-reset-the-controller-before.patch
rename to queue-6.6/bluetooth-btusb-mediatek-reset-the-controller-before.patch
diff --git a/staging-6.6/bluetooth-btusb-mediatek-return-error-for-failed-reg.patch b/queue-6.6/bluetooth-btusb-mediatek-return-error-for-failed-reg.patch
similarity index 100%
rename from staging-6.6/bluetooth-btusb-mediatek-return-error-for-failed-reg.patch
rename to queue-6.6/bluetooth-btusb-mediatek-return-error-for-failed-reg.patch
diff --git a/staging-6.6/bpf-arm64-reject-out-of-range-b.cond-targets.patch b/queue-6.6/bpf-arm64-reject-out-of-range-b.cond-targets.patch
similarity index 100%
rename from staging-6.6/bpf-arm64-reject-out-of-range-b.cond-targets.patch
rename to queue-6.6/bpf-arm64-reject-out-of-range-b.cond-targets.patch
diff --git a/staging-6.6/ext4-get-rid-of-ppath-in-get_ext_path.patch b/queue-6.6/ext4-get-rid-of-ppath-in-get_ext_path.patch
similarity index 100%
rename from staging-6.6/ext4-get-rid-of-ppath-in-get_ext_path.patch
rename to queue-6.6/ext4-get-rid-of-ppath-in-get_ext_path.patch
diff --git a/staging-6.6/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch b/queue-6.6/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
similarity index 100%
rename from staging-6.6/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
rename to queue-6.6/loongarch-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
diff --git a/staging-6.6/nfsd-release-layout-stid-on-setlease-failure.patch b/queue-6.6/nfsd-release-layout-stid-on-setlease-failure.patch
similarity index 100%
rename from staging-6.6/nfsd-release-layout-stid-on-setlease-failure.patch
rename to queue-6.6/nfsd-release-layout-stid-on-setlease-failure.patch
diff --git a/staging-6.6/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch b/queue-6.6/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
similarity index 100%
rename from staging-6.6/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
rename to queue-6.6/nfsd-reset-write-verifier-on-deferred-writeback-erro.patch
diff --git a/staging-6.6/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch b/queue-6.6/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
similarity index 100%
rename from staging-6.6/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
rename to queue-6.6/perf-fix-dangling-cgroup-pointer-in-cpuctx-backport.patch
diff --git a/staging-6.6/series b/queue-6.6/series
similarity index 100%
rename from staging-6.6/series
rename to queue-6.6/series
diff --git a/staging-6.6/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-6.6/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-6.6/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-6.6/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
diff --git a/staging-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch b/queue-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch
similarity index 100%
rename from staging-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch
rename to queue-7.1/kernel-fork-clear-pf_block_ts-in-copy_process.patch
diff --git a/staging-7.1/rust-str-clean-unused-import-for-rust-1.98.patch b/queue-7.1/rust-str-clean-unused-import-for-rust-1.98.patch
similarity index 100%
rename from staging-7.1/rust-str-clean-unused-import-for-rust-1.98.patch
rename to queue-7.1/rust-str-clean-unused-import-for-rust-1.98.patch
diff --git a/staging-7.1/rust-str-use-the-kernel-vertical-imports-style.patch b/queue-7.1/rust-str-use-the-kernel-vertical-imports-style.patch
similarity index 100%
rename from staging-7.1/rust-str-use-the-kernel-vertical-imports-style.patch
rename to queue-7.1/rust-str-use-the-kernel-vertical-imports-style.patch
diff --git a/staging-7.1/series b/queue-7.1/series
similarity index 100%
rename from staging-7.1/series
rename to queue-7.1/series
diff --git a/staging-7.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch b/queue-7.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
similarity index 100%
rename from staging-7.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch
rename to queue-7.1/userfaultfd-gate-must_wait-writability-check-on-pte_.patch