From: Sasha Levin Date: Sat, 27 Jun 2026 11:34:59 +0000 (-0400) Subject: merge staging into queue: 7.1 6.18 6.12 6.6 6.1 5.15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0da84c212c5718bf555f63aaf735e3c72fcf5d73;p=thirdparty%2Fkernel%2Fstable-queue.git merge staging into queue: 7.1 6.18 6.12 6.6 6.1 5.15 --- diff --git a/staging-5.15/revert-ptp-add-testptp-mask-test.patch b/queue-5.15/revert-ptp-add-testptp-mask-test.patch similarity index 100% rename from staging-5.15/revert-ptp-add-testptp-mask-test.patch rename to queue-5.15/revert-ptp-add-testptp-mask-test.patch diff --git a/staging-5.15/revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch b/queue-5.15/revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch similarity index 100% rename from staging-5.15/revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch rename to queue-5.15/revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch diff --git a/queue-5.15/series b/queue-5.15/series index ff8ab1afa4..f3da244a4d 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -21,3 +21,5 @@ regulator-core-fix-locking-in-regulator_resolve_supply-error-path.patch vc_screen-fix-null-ptr-deref-in-vcs_notifier-during-concurrent-vcs_write.patch media-vidtv-fix-null-pointer-dereference-in-vidtv_mux_push_si.patch virtiofs-fix-uaf-on-submount-umount.patch +revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch +revert-ptp-add-testptp-mask-test.patch diff --git a/staging-6.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch b/queue-6.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch similarity index 100% rename from staging-6.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch rename to queue-6.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch diff --git a/staging-6.1/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch b/queue-6.1/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch similarity index 100% rename from staging-6.1/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch rename to queue-6.1/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch diff --git a/staging-6.1/mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch b/queue-6.1/mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch similarity index 100% rename from staging-6.1/mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch rename to queue-6.1/mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch diff --git a/staging-6.1/perf-bench-avoid-ndebug-warning.patch b/queue-6.1/perf-bench-avoid-ndebug-warning.patch similarity index 100% rename from staging-6.1/perf-bench-avoid-ndebug-warning.patch rename to queue-6.1/perf-bench-avoid-ndebug-warning.patch diff --git a/staging-6.1/perf-block-range-move-debug-code-behind-ifndef-ndebu.patch b/queue-6.1/perf-block-range-move-debug-code-behind-ifndef-ndebu.patch similarity index 100% rename from staging-6.1/perf-block-range-move-debug-code-behind-ifndef-ndebu.patch rename to queue-6.1/perf-block-range-move-debug-code-behind-ifndef-ndebu.patch diff --git a/staging-6.1/revert-ptp-add-testptp-mask-test.patch b/queue-6.1/revert-ptp-add-testptp-mask-test.patch similarity index 100% rename from staging-6.1/revert-ptp-add-testptp-mask-test.patch rename to queue-6.1/revert-ptp-add-testptp-mask-test.patch diff --git a/queue-6.1/series b/queue-6.1/series index 5e37fb87c4..c7c870b56f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -41,3 +41,9 @@ vc_screen-fix-null-ptr-deref-in-vcs_notifier-during-concurrent-vcs_write.patch ksmbd-reject-non-valid-session-in-compound-request-branch.patch media-vidtv-fix-null-pointer-dereference-in-vidtv_mux_push_si.patch virtiofs-fix-uaf-on-submount-umount.patch +perf-bench-avoid-ndebug-warning.patch +perf-block-range-move-debug-code-behind-ifndef-ndebu.patch +kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch +kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch +revert-ptp-add-testptp-mask-test.patch +mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch diff --git a/staging-6.12/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch b/queue-6.12/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch similarity index 100% rename from staging-6.12/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch rename to queue-6.12/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch diff --git a/staging-6.12/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch b/queue-6.12/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch similarity index 100% rename from staging-6.12/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch rename to queue-6.12/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch diff --git a/queue-6.12/series b/queue-6.12/series index 693e0ee198..cd1d4f3ab8 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -90,3 +90,5 @@ serial-qcom_geni-fix-rx-dma-stall-when-se_dma_rx_len_in-is-zero.patch ksmbd-reject-non-valid-session-in-compound-request-branch.patch media-vidtv-fix-null-pointer-dereference-in-vidtv_mux_push_si.patch virtiofs-fix-uaf-on-submount-umount.patch +kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch +kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch diff --git a/staging-6.18/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch b/queue-6.18/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch similarity index 100% rename from staging-6.18/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch rename to queue-6.18/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch diff --git a/staging-6.18/lsm-add-backing_file-lsm-hooks.patch b/queue-6.18/lsm-add-backing_file-lsm-hooks.patch similarity index 100% rename from staging-6.18/lsm-add-backing_file-lsm-hooks.patch rename to queue-6.18/lsm-add-backing_file-lsm-hooks.patch diff --git a/staging-6.18/selinux-fix-overlayfs-mmap-and-mprotect-access-check.patch b/queue-6.18/selinux-fix-overlayfs-mmap-and-mprotect-access-check.patch similarity index 100% rename from staging-6.18/selinux-fix-overlayfs-mmap-and-mprotect-access-check.patch rename to queue-6.18/selinux-fix-overlayfs-mmap-and-mprotect-access-check.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/eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch b/queue-6.6/eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch similarity index 100% rename from staging-6.6/eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch rename to queue-6.6/eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch diff --git a/staging-6.6/eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch b/queue-6.6/eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch similarity index 100% rename from staging-6.6/eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch rename to queue-6.6/eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch diff --git a/staging-6.6/eventpoll-kill-__ep_remove.patch b/queue-6.6/eventpoll-kill-__ep_remove.patch similarity index 100% rename from staging-6.6/eventpoll-kill-__ep_remove.patch rename to queue-6.6/eventpoll-kill-__ep_remove.patch diff --git a/staging-6.6/eventpoll-move-epi_fget-up.patch b/queue-6.6/eventpoll-move-epi_fget-up.patch similarity index 100% rename from staging-6.6/eventpoll-move-epi_fget-up.patch rename to queue-6.6/eventpoll-move-epi_fget-up.patch diff --git a/staging-6.6/eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch b/queue-6.6/eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch similarity index 100% rename from staging-6.6/eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch rename to queue-6.6/eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch diff --git a/staging-6.6/eventpoll-split-__ep_remove.patch b/queue-6.6/eventpoll-split-__ep_remove.patch similarity index 100% rename from staging-6.6/eventpoll-split-__ep_remove.patch rename to queue-6.6/eventpoll-split-__ep_remove.patch diff --git a/staging-6.6/eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch b/queue-6.6/eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch similarity index 100% rename from staging-6.6/eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch rename to queue-6.6/eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch diff --git a/staging-6.6/file-add-fput-cleanup-helper.patch b/queue-6.6/file-add-fput-cleanup-helper.patch similarity index 100% rename from staging-6.6/file-add-fput-cleanup-helper.patch rename to queue-6.6/file-add-fput-cleanup-helper.patch diff --git a/staging-6.6/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch b/queue-6.6/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch similarity index 100% rename from staging-6.6/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch rename to queue-6.6/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch diff --git a/staging-6.6/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch b/queue-6.6/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch similarity index 100% rename from staging-6.6/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch rename to queue-6.6/kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch diff --git a/staging-6.6/revert-ptp-add-testptp-mask-test.patch b/queue-6.6/revert-ptp-add-testptp-mask-test.patch similarity index 100% rename from staging-6.6/revert-ptp-add-testptp-mask-test.patch rename to queue-6.6/revert-ptp-add-testptp-mask-test.patch diff --git a/queue-6.6/series b/queue-6.6/series index 75227c0b9a..c79d3bee68 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -72,3 +72,14 @@ vc_screen-fix-null-ptr-deref-in-vcs_notifier-during-concurrent-vcs_write.patch ksmbd-reject-non-valid-session-in-compound-request-branch.patch media-vidtv-fix-null-pointer-dereference-in-vidtv_mux_push_si.patch virtiofs-fix-uaf-on-submount-umount.patch +file-add-fput-cleanup-helper.patch +eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch +eventpoll-split-__ep_remove.patch +eventpoll-kill-__ep_remove.patch +eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch +eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch +eventpoll-move-epi_fget-up.patch +eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch +kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch +kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch +revert-ptp-add-testptp-mask-test.patch diff --git a/staging-7.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch b/queue-7.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch similarity index 100% rename from staging-7.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch rename to queue-7.1/kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.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-5.15/series b/staging-5.15/series deleted file mode 100644 index d7c0dfd243..0000000000 --- a/staging-5.15/series +++ /dev/null @@ -1,2 +0,0 @@ -revert-selftest-ptp-update-ptp-selftest-to-exercise-.patch -revert-ptp-add-testptp-mask-test.patch diff --git a/staging-6.1/series b/staging-6.1/series deleted file mode 100644 index 1cebfc9e2e..0000000000 --- a/staging-6.1/series +++ /dev/null @@ -1,6 +0,0 @@ -perf-bench-avoid-ndebug-warning.patch -perf-block-range-move-debug-code-behind-ifndef-ndebu.patch -kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch -kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch -revert-ptp-add-testptp-mask-test.patch -mm-mglru-skip-special-vmas-in-lru_gen_look_around.patch diff --git a/staging-6.12/series b/staging-6.12/series deleted file mode 100644 index c98117dad8..0000000000 --- a/staging-6.12/series +++ /dev/null @@ -1,2 +0,0 @@ -kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch -kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch diff --git a/staging-6.6/series b/staging-6.6/series deleted file mode 100644 index f434d9665f..0000000000 --- a/staging-6.6/series +++ /dev/null @@ -1,11 +0,0 @@ -file-add-fput-cleanup-helper.patch -eventpoll-use-hlist_is_singular_node-in-__ep_remove.patch -eventpoll-split-__ep_remove.patch -eventpoll-kill-__ep_remove.patch -eventpoll-drop-vestigial-__-prefix-from-ep_remove_-f.patch -eventpoll-rename-ep_remove_safe-back-to-ep_remove.patch -eventpoll-move-epi_fget-up.patch -eventpoll-fix-ep_remove-struct-eventpoll-struct-file.patch -kvm-x86-fix-shadow-paging-use-after-free-due-to-unex.patch -kvm-x86-mmu-ensure-hugepage-is-in-by-slot-before-che.patch -revert-ptp-add-testptp-mask-test.patch