From: Greg Kroah-Hartman Date: Fri, 24 Jul 2026 14:31:46 +0000 (+0200) 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/gitweb/index.cgi?a=commitdiff_plain;h=75c3a7e2c7fa2024267dc94f78344e017cbddb60;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/cpu-hotplug-bound-hotplug-states-sysfs-output.patch b/queue-5.10/cpu-hotplug-bound-hotplug-states-sysfs-output.patch similarity index 100% rename from staging-5.10/cpu-hotplug-bound-hotplug-states-sysfs-output.patch rename to queue-5.10/cpu-hotplug-bound-hotplug-states-sysfs-output.patch diff --git a/staging-5.10/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch b/queue-5.10/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch similarity index 100% rename from staging-5.10/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch rename to queue-5.10/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch diff --git a/staging-5.10/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch b/queue-5.10/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch similarity index 100% rename from staging-5.10/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch rename to queue-5.10/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.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.15/futex-prevent-lockup-in-requeue-pi-during-signal-tim.patch b/queue-5.15/futex-prevent-lockup-in-requeue-pi-during-signal-tim.patch similarity index 100% rename from staging-5.15/futex-prevent-lockup-in-requeue-pi-during-signal-tim.patch rename to queue-5.15/futex-prevent-lockup-in-requeue-pi-during-signal-tim.patch diff --git a/staging-5.15/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch b/queue-5.15/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch similarity index 100% rename from staging-5.15/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch rename to queue-5.15/macsec-don-t-read-an-unset-mac-header-in-macsec_encr.patch diff --git a/staging-5.15/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch b/queue-5.15/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch similarity index 100% rename from staging-5.15/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.patch rename to queue-5.15/nvmet-tcp-fix-potential-uaf-when-ddgst-mismatch.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-6.1/af_unix-set-gc_in_progress-to-true-in-unix_gc.patch b/queue-6.1/af_unix-set-gc_in_progress-to-true-in-unix_gc.patch similarity index 100% rename from staging-6.1/af_unix-set-gc_in_progress-to-true-in-unix_gc.patch rename to queue-6.1/af_unix-set-gc_in_progress-to-true-in-unix_gc.patch diff --git a/staging-6.1/perf-x86-amd-brs-fix-kernel-address-leakage.patch b/queue-6.1/perf-x86-amd-brs-fix-kernel-address-leakage.patch similarity index 100% rename from staging-6.1/perf-x86-amd-brs-fix-kernel-address-leakage.patch rename to queue-6.1/perf-x86-amd-brs-fix-kernel-address-leakage.patch diff --git a/staging-6.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch b/queue-6.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch similarity index 100% rename from staging-6.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch rename to queue-6.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.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.12/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch b/queue-6.12/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch similarity index 100% rename from staging-6.12/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch rename to queue-6.12/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch diff --git a/staging-6.12/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch b/queue-6.12/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch similarity index 100% rename from staging-6.12/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch rename to queue-6.12/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch diff --git a/staging-6.12/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch b/queue-6.12/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch similarity index 100% rename from staging-6.12/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch rename to queue-6.12/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch diff --git a/staging-6.12/net-airoha-fix-skb-priority-underflow-in-airoha_dev_.patch b/queue-6.12/net-airoha-fix-skb-priority-underflow-in-airoha_dev_.patch similarity index 100% rename from staging-6.12/net-airoha-fix-skb-priority-underflow-in-airoha_dev_.patch rename to queue-6.12/net-airoha-fix-skb-priority-underflow-in-airoha_dev_.patch diff --git a/staging-6.12/net-airoha-move-airoha_eth-driver-in-a-dedicated-fol.patch b/queue-6.12/net-airoha-move-airoha_eth-driver-in-a-dedicated-fol.patch similarity index 100% rename from staging-6.12/net-airoha-move-airoha_eth-driver-in-a-dedicated-fol.patch rename to queue-6.12/net-airoha-move-airoha_eth-driver-in-a-dedicated-fol.patch diff --git a/staging-6.12/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch b/queue-6.12/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch similarity index 100% rename from staging-6.12/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch rename to queue-6.12/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch diff --git a/staging-6.12/netfilter-nft_counter-serialize-reset-with-spinlock.patch b/queue-6.12/netfilter-nft_counter-serialize-reset-with-spinlock.patch similarity index 100% rename from staging-6.12/netfilter-nft_counter-serialize-reset-with-spinlock.patch rename to queue-6.12/netfilter-nft_counter-serialize-reset-with-spinlock.patch diff --git a/staging-6.12/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch b/queue-6.12/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch similarity index 100% rename from staging-6.12/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch rename to queue-6.12/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch diff --git a/staging-6.12/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch b/queue-6.12/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch similarity index 100% rename from staging-6.12/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch rename to queue-6.12/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch diff --git a/staging-6.12/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch b/queue-6.12/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch similarity index 100% rename from staging-6.12/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch rename to queue-6.12/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.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.18/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch b/queue-6.18/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch similarity index 100% rename from staging-6.18/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch rename to queue-6.18/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch diff --git a/staging-6.18/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch b/queue-6.18/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch similarity index 100% rename from staging-6.18/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch rename to queue-6.18/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch diff --git a/staging-6.18/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch b/queue-6.18/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch similarity index 100% rename from staging-6.18/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch rename to queue-6.18/fs-proc-task_mmu-fix-make_uffd_wp_huge_pte-prot-upda.patch diff --git a/staging-6.18/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch b/queue-6.18/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch similarity index 100% rename from staging-6.18/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch rename to queue-6.18/netfilter-nf_tables-revert-commit_mutex-usage-in-res.patch diff --git a/staging-6.18/netfilter-nft_counter-serialize-reset-with-spinlock.patch b/queue-6.18/netfilter-nft_counter-serialize-reset-with-spinlock.patch similarity index 100% rename from staging-6.18/netfilter-nft_counter-serialize-reset-with-spinlock.patch rename to queue-6.18/netfilter-nft_counter-serialize-reset-with-spinlock.patch diff --git a/staging-6.18/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch b/queue-6.18/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch similarity index 100% rename from staging-6.18/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch rename to queue-6.18/netfilter-nft_quota-use-atomic64_xchg-for-reset.patch diff --git a/staging-6.18/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch b/queue-6.18/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch similarity index 100% rename from staging-6.18/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch rename to queue-6.18/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch diff --git a/staging-6.18/posix-cpu-timers-prevent-uaf-caused-by-non-leader-ex.patch b/queue-6.18/posix-cpu-timers-prevent-uaf-caused-by-non-leader-ex.patch similarity index 100% rename from staging-6.18/posix-cpu-timers-prevent-uaf-caused-by-non-leader-ex.patch rename to queue-6.18/posix-cpu-timers-prevent-uaf-caused-by-non-leader-ex.patch diff --git a/staging-6.18/posix-timers-expand-timer_-re-arm-callbacks-with-a-b.patch b/queue-6.18/posix-timers-expand-timer_-re-arm-callbacks-with-a-b.patch similarity index 100% rename from staging-6.18/posix-timers-expand-timer_-re-arm-callbacks-with-a-b.patch rename to queue-6.18/posix-timers-expand-timer_-re-arm-callbacks-with-a-b.patch diff --git a/staging-6.18/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch b/queue-6.18/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch similarity index 100% rename from staging-6.18/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch rename to queue-6.18/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.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.6/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch b/queue-6.6/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch similarity index 100% rename from staging-6.6/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch rename to queue-6.6/bpf-fix-ld_-abs-ind-failure-path-analysis-in-subprog.patch diff --git a/staging-6.6/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch b/queue-6.6/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch similarity index 100% rename from staging-6.6/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch rename to queue-6.6/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch diff --git a/staging-6.6/platform-x86-amd-pmc-avoid-logging-null-for-dmi-valu.patch b/queue-6.6/platform-x86-amd-pmc-avoid-logging-null-for-dmi-valu.patch similarity index 100% rename from staging-6.6/platform-x86-amd-pmc-avoid-logging-null-for-dmi-valu.patch rename to queue-6.6/platform-x86-amd-pmc-avoid-logging-null-for-dmi-valu.patch diff --git a/staging-6.6/platform-x86-amd-pmc-don-t-log-during-intermediate-w.patch b/queue-6.6/platform-x86-amd-pmc-don-t-log-during-intermediate-w.patch similarity index 100% rename from staging-6.6/platform-x86-amd-pmc-don-t-log-during-intermediate-w.patch rename to queue-6.6/platform-x86-amd-pmc-don-t-log-during-intermediate-w.patch diff --git a/staging-6.6/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch b/queue-6.6/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch similarity index 100% rename from staging-6.6/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch rename to queue-6.6/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch diff --git a/staging-6.6/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch b/queue-6.6/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch similarity index 100% rename from staging-6.6/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.patch rename to queue-6.6/selftests-bpf-add-tests-for-ld_-abs-ind-failure-path.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-7.1/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch b/queue-7.1/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch similarity index 100% rename from staging-7.1/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch rename to queue-7.1/drm-virtio-fix-deadlock-in-display_info_cb-by-removi.patch diff --git a/staging-7.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch b/queue-7.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch similarity index 100% rename from staging-7.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch rename to queue-7.1/platform-x86-intel-uncore-freq-fix-current_freq_khz-.patch diff --git a/staging-7.1/sched_ext-skip-ops.set_weight-for-disabled-tasks.patch b/queue-7.1/sched_ext-skip-ops.set_weight-for-disabled-tasks.patch similarity index 100% rename from staging-7.1/sched_ext-skip-ops.set_weight-for-disabled-tasks.patch rename to queue-7.1/sched_ext-skip-ops.set_weight-for-disabled-tasks.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