From: Greg Kroah-Hartman Date: Sun, 19 Jul 2026 07:47:18 +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.cgi?a=commitdiff_plain;h=83689a7c3403f3d9ee70aef435c218ddae95179f;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/crypto-algif_skcipher-force-synchronous-processing-o.patch b/queue-5.10/crypto-algif_skcipher-force-synchronous-processing-o.patch similarity index 100% rename from staging-5.10/crypto-algif_skcipher-force-synchronous-processing-o.patch rename to queue-5.10/crypto-algif_skcipher-force-synchronous-processing-o.patch diff --git a/staging-5.10/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch b/queue-5.10/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch similarity index 100% rename from staging-5.10/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch rename to queue-5.10/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch diff --git a/queue-5.10/series b/queue-5.10/series index 8f940a039d..84cef862a5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -155,3 +155,6 @@ input-maplecontrol-set-driver-data-before-registering-input-device.patch rdma-siw-bound-read-response-placement-to-the-rread-length.patch fuse-fix-device-node-leak-in-cuse_process_init_reply.patch fuse-re-lock-request-before-returning-from-fuse_ref_folio.patch +sched-fair-only-update-stats-for-allowed-cpus-when-l.patch +crypto-algif_skcipher-force-synchronous-processing-o.patch +tools-mm-slabinfo-fix-total_objects-attribute-name.patch diff --git a/staging-5.10/tools-mm-slabinfo-fix-total_objects-attribute-name.patch b/queue-5.10/tools-mm-slabinfo-fix-total_objects-attribute-name.patch similarity index 100% rename from staging-5.10/tools-mm-slabinfo-fix-total_objects-attribute-name.patch rename to queue-5.10/tools-mm-slabinfo-fix-total_objects-attribute-name.patch diff --git a/staging-5.15/crypto-algif_skcipher-force-synchronous-processing-o.patch b/queue-5.15/crypto-algif_skcipher-force-synchronous-processing-o.patch similarity index 100% rename from staging-5.15/crypto-algif_skcipher-force-synchronous-processing-o.patch rename to queue-5.15/crypto-algif_skcipher-force-synchronous-processing-o.patch diff --git a/staging-5.15/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch b/queue-5.15/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch similarity index 100% rename from staging-5.15/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch rename to queue-5.15/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-5.15/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch b/queue-5.15/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch similarity index 100% rename from staging-5.15/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch rename to queue-5.15/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch diff --git a/queue-5.15/series b/queue-5.15/series index b627d905a3..c96f3af1d9 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -196,3 +196,7 @@ fuse-fix-device-node-leak-in-cuse_process_init_reply.patch fuse-re-lock-request-before-returning-from-fuse_ref_folio.patch xfs-fail-recovery-on-a-committed-log-item-with-no-regions.patch xfs-resample-the-data-fork-mapping-after-cycling-ilock.patch +sched-fair-only-update-stats-for-allowed-cpus-when-l.patch +crypto-algif_skcipher-force-synchronous-processing-o.patch +tools-mm-slabinfo-fix-total_objects-attribute-name.patch +net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-5.15/tools-mm-slabinfo-fix-total_objects-attribute-name.patch b/queue-5.15/tools-mm-slabinfo-fix-total_objects-attribute-name.patch similarity index 100% rename from staging-5.15/tools-mm-slabinfo-fix-total_objects-attribute-name.patch rename to queue-5.15/tools-mm-slabinfo-fix-total_objects-attribute-name.patch diff --git a/staging-6.1/crypto-algif_skcipher-force-synchronous-processing-o.patch b/queue-6.1/crypto-algif_skcipher-force-synchronous-processing-o.patch similarity index 100% rename from staging-6.1/crypto-algif_skcipher-force-synchronous-processing-o.patch rename to queue-6.1/crypto-algif_skcipher-force-synchronous-processing-o.patch diff --git a/staging-6.1/fs-quota-create-dedicated-workqueue-for-quota_releas.patch b/queue-6.1/fs-quota-create-dedicated-workqueue-for-quota_releas.patch similarity index 100% rename from staging-6.1/fs-quota-create-dedicated-workqueue-for-quota_releas.patch rename to queue-6.1/fs-quota-create-dedicated-workqueue-for-quota_releas.patch diff --git a/staging-6.1/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch b/queue-6.1/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch similarity index 100% rename from staging-6.1/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch rename to queue-6.1/net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-6.1/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch b/queue-6.1/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch similarity index 100% rename from staging-6.1/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch rename to queue-6.1/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch diff --git a/queue-6.1/series b/queue-6.1/series index fd9416ad1b..86682659a5 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -251,3 +251,9 @@ ipv4-account-for-fraggap-on-the-paged-allocation-path.patch smb-client-reject-overlapping-data-areas-in-smb2-responses.patch xfs-fail-recovery-on-a-committed-log-item-with-no-regions.patch xfs-resample-the-data-fork-mapping-after-cycling-ilock.patch +smb-server-do-not-require-delete-access-for-non-repl.patch +sched-fair-only-update-stats-for-allowed-cpus-when-l.patch +fs-quota-create-dedicated-workqueue-for-quota_releas.patch +crypto-algif_skcipher-force-synchronous-processing-o.patch +tools-mm-slabinfo-fix-total_objects-attribute-name.patch +net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-6.1/smb-server-do-not-require-delete-access-for-non-repl.patch b/queue-6.1/smb-server-do-not-require-delete-access-for-non-repl.patch similarity index 100% rename from staging-6.1/smb-server-do-not-require-delete-access-for-non-repl.patch rename to queue-6.1/smb-server-do-not-require-delete-access-for-non-repl.patch diff --git a/staging-6.1/tools-mm-slabinfo-fix-total_objects-attribute-name.patch b/queue-6.1/tools-mm-slabinfo-fix-total_objects-attribute-name.patch similarity index 100% rename from staging-6.1/tools-mm-slabinfo-fix-total_objects-attribute-name.patch rename to queue-6.1/tools-mm-slabinfo-fix-total_objects-attribute-name.patch diff --git a/staging-6.12/bpf-prefer-dirty-packs-for-ebpf-allocations.patch b/queue-6.12/bpf-prefer-dirty-packs-for-ebpf-allocations.patch similarity index 100% rename from staging-6.12/bpf-prefer-dirty-packs-for-ebpf-allocations.patch rename to queue-6.12/bpf-prefer-dirty-packs-for-ebpf-allocations.patch diff --git a/staging-6.12/bpf-prefer-packs-that-won-t-trigger-an-ibpb-flush-on.patch b/queue-6.12/bpf-prefer-packs-that-won-t-trigger-an-ibpb-flush-on.patch similarity index 100% rename from staging-6.12/bpf-prefer-packs-that-won-t-trigger-an-ibpb-flush-on.patch rename to queue-6.12/bpf-prefer-packs-that-won-t-trigger-an-ibpb-flush-on.patch diff --git a/staging-6.12/bpf-restrict-jit-predictor-flush-to-cbpf.patch b/queue-6.12/bpf-restrict-jit-predictor-flush-to-cbpf.patch similarity index 100% rename from staging-6.12/bpf-restrict-jit-predictor-flush-to-cbpf.patch rename to queue-6.12/bpf-restrict-jit-predictor-flush-to-cbpf.patch diff --git a/staging-6.12/bpf-skip-redundant-ibpb-in-pack-allocator.patch b/queue-6.12/bpf-skip-redundant-ibpb-in-pack-allocator.patch similarity index 100% rename from staging-6.12/bpf-skip-redundant-ibpb-in-pack-allocator.patch rename to queue-6.12/bpf-skip-redundant-ibpb-in-pack-allocator.patch diff --git a/staging-6.12/bpf-support-for-hardening-against-jit-spraying.patch b/queue-6.12/bpf-support-for-hardening-against-jit-spraying.patch similarity index 100% rename from staging-6.12/bpf-support-for-hardening-against-jit-spraying.patch rename to queue-6.12/bpf-support-for-hardening-against-jit-spraying.patch diff --git a/staging-6.12/crypto-algif_skcipher-force-synchronous-processing.patch b/queue-6.12/crypto-algif_skcipher-force-synchronous-processing.patch similarity index 100% rename from staging-6.12/crypto-algif_skcipher-force-synchronous-processing.patch rename to queue-6.12/crypto-algif_skcipher-force-synchronous-processing.patch diff --git a/staging-6.12/iommu-pass-old-domain-to-set_dev_pasid-op.patch b/queue-6.12/iommu-pass-old-domain-to-set_dev_pasid-op.patch similarity index 100% rename from staging-6.12/iommu-pass-old-domain-to-set_dev_pasid-op.patch rename to queue-6.12/iommu-pass-old-domain-to-set_dev_pasid-op.patch diff --git a/staging-6.12/iommu-vt-d-cleanup-intel_context_flush_present.patch b/queue-6.12/iommu-vt-d-cleanup-intel_context_flush_present.patch similarity index 100% rename from staging-6.12/iommu-vt-d-cleanup-intel_context_flush_present.patch rename to queue-6.12/iommu-vt-d-cleanup-intel_context_flush_present.patch diff --git a/staging-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-con.patch b/queue-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-con.patch similarity index 100% rename from staging-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-con.patch rename to queue-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-con.patch diff --git a/staging-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch b/queue-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch similarity index 100% rename from staging-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch rename to queue-6.12/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch diff --git a/staging-6.12/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch b/queue-6.12/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch similarity index 100% rename from staging-6.12/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch rename to queue-6.12/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch diff --git a/staging-6.12/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch b/queue-6.12/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch similarity index 100% rename from staging-6.12/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch rename to queue-6.12/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch diff --git a/staging-6.12/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch b/queue-6.12/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch similarity index 100% rename from staging-6.12/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch rename to queue-6.12/sched-fair-only-update-stats-for-allowed-cpus-when-l.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/smb-server-do-not-require-delete-access-for-non-repl.patch b/queue-6.12/smb-server-do-not-require-delete-access-for-non-repl.patch similarity index 100% rename from staging-6.12/smb-server-do-not-require-delete-access-for-non-repl.patch rename to queue-6.12/smb-server-do-not-require-delete-access-for-non-repl.patch diff --git a/staging-6.12/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch b/queue-6.12/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch similarity index 100% rename from staging-6.12/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch rename to queue-6.12/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch diff --git a/staging-6.12/timekeeping-register-default-clocksource-before-taki.patch b/queue-6.12/timekeeping-register-default-clocksource-before-taki.patch similarity index 100% rename from staging-6.12/timekeeping-register-default-clocksource-before-taki.patch rename to queue-6.12/timekeeping-register-default-clocksource-before-taki.patch diff --git a/staging-6.12/x86-bugs-enable-ibpb-flush-on-bpf-jit-allocation.patch b/queue-6.12/x86-bugs-enable-ibpb-flush-on-bpf-jit-allocation.patch similarity index 100% rename from staging-6.12/x86-bugs-enable-ibpb-flush-on-bpf-jit-allocation.patch rename to queue-6.12/x86-bugs-enable-ibpb-flush-on-bpf-jit-allocation.patch diff --git a/staging-6.18/crypto-algif_skcipher-force-synchronous-processing.patch b/queue-6.18/crypto-algif_skcipher-force-synchronous-processing.patch similarity index 100% rename from staging-6.18/crypto-algif_skcipher-force-synchronous-processing.patch rename to queue-6.18/crypto-algif_skcipher-force-synchronous-processing.patch diff --git a/staging-6.18/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch b/queue-6.18/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch similarity index 100% rename from staging-6.18/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch rename to queue-6.18/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch diff --git a/staging-6.18/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch b/queue-6.18/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch similarity index 100% rename from staging-6.18/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch rename to queue-6.18/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch diff --git a/staging-6.18/nvme-pci-dma-unmap-the-correct-regions-in-nvme_free_.patch b/queue-6.18/nvme-pci-dma-unmap-the-correct-regions-in-nvme_free_.patch similarity index 100% rename from staging-6.18/nvme-pci-dma-unmap-the-correct-regions-in-nvme_free_.patch rename to queue-6.18/nvme-pci-dma-unmap-the-correct-regions-in-nvme_free_.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/smb-server-do-not-require-delete-access-for-non-repl.patch b/queue-6.18/smb-server-do-not-require-delete-access-for-non-repl.patch similarity index 100% rename from staging-6.18/smb-server-do-not-require-delete-access-for-non-repl.patch rename to queue-6.18/smb-server-do-not-require-delete-access-for-non-repl.patch diff --git a/staging-6.18/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch b/queue-6.18/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch similarity index 100% rename from staging-6.18/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch rename to queue-6.18/tcp-add-preempt_-disable-enable-_nested-in-reqsk_que.patch diff --git a/staging-6.6/block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch b/queue-6.6/block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch similarity index 100% rename from staging-6.6/block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch rename to queue-6.6/block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch diff --git a/staging-6.6/crypto-algif_skcipher-force-synchronous-processing-o.patch b/queue-6.6/crypto-algif_skcipher-force-synchronous-processing-o.patch similarity index 100% rename from staging-6.6/crypto-algif_skcipher-force-synchronous-processing-o.patch rename to queue-6.6/crypto-algif_skcipher-force-synchronous-processing-o.patch diff --git a/staging-6.6/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch b/queue-6.6/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch similarity index 100% rename from staging-6.6/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch rename to queue-6.6/kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch diff --git a/staging-6.6/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch b/queue-6.6/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch similarity index 100% rename from staging-6.6/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch rename to queue-6.6/kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch diff --git a/staging-6.6/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch b/queue-6.6/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch similarity index 100% rename from staging-6.6/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch rename to queue-6.6/sched-fair-only-update-stats-for-allowed-cpus-when-l.patch diff --git a/queue-6.6/series b/queue-6.6/series index 6e3fb39d76..f51755bd21 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -323,3 +323,9 @@ fuse-re-lock-request-before-returning-from-fuse_ref_folio.patch smb-client-reject-overlapping-data-areas-in-smb2-responses.patch xfs-fail-recovery-on-a-committed-log-item-with-no-regions.patch xfs-resample-the-data-fork-mapping-after-cycling-ilock.patch +smb-server-do-not-require-delete-access-for-non-repl.patch +block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch +sched-fair-only-update-stats-for-allowed-cpus-when-l.patch +crypto-algif_skcipher-force-synchronous-processing-o.patch +kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch +kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch diff --git a/staging-6.6/smb-server-do-not-require-delete-access-for-non-repl.patch b/queue-6.6/smb-server-do-not-require-delete-access-for-non-repl.patch similarity index 100% rename from staging-6.6/smb-server-do-not-require-delete-access-for-non-repl.patch rename to queue-6.6/smb-server-do-not-require-delete-access-for-non-repl.patch diff --git a/staging-7.1/crypto-algif_skcipher-force-synchronous-processing.patch b/queue-7.1/crypto-algif_skcipher-force-synchronous-processing.patch similarity index 100% rename from staging-7.1/crypto-algif_skcipher-force-synchronous-processing.patch rename to queue-7.1/crypto-algif_skcipher-force-synchronous-processing.patch diff --git a/staging-7.1/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch b/queue-7.1/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch similarity index 100% rename from staging-7.1/iommu-vt-d-clear-present-bit-before-tearing-down-sca.patch rename to queue-7.1/iommu-vt-d-clear-present-bit-before-tearing-down-sca.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.10/series b/staging-5.10/series deleted file mode 100644 index 50d9ea5799..0000000000 --- a/staging-5.10/series +++ /dev/null @@ -1,3 +0,0 @@ -sched-fair-only-update-stats-for-allowed-cpus-when-l.patch -crypto-algif_skcipher-force-synchronous-processing-o.patch -tools-mm-slabinfo-fix-total_objects-attribute-name.patch diff --git a/staging-5.15/series b/staging-5.15/series deleted file mode 100644 index ebd8a577f1..0000000000 --- a/staging-5.15/series +++ /dev/null @@ -1,4 +0,0 @@ -sched-fair-only-update-stats-for-allowed-cpus-when-l.patch -crypto-algif_skcipher-force-synchronous-processing-o.patch -tools-mm-slabinfo-fix-total_objects-attribute-name.patch -net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-6.1/series b/staging-6.1/series deleted file mode 100644 index 28f3ef7bba..0000000000 --- a/staging-6.1/series +++ /dev/null @@ -1,6 +0,0 @@ -smb-server-do-not-require-delete-access-for-non-repl.patch -sched-fair-only-update-stats-for-allowed-cpus-when-l.patch -fs-quota-create-dedicated-workqueue-for-quota_releas.patch -crypto-algif_skcipher-force-synchronous-processing-o.patch -tools-mm-slabinfo-fix-total_objects-attribute-name.patch -net-dsa-tag_ksz-do-not-rely-on-skb_mac_header-in-tx-.patch diff --git a/staging-6.6/series b/staging-6.6/series deleted file mode 100644 index 76fbd3fd31..0000000000 --- a/staging-6.6/series +++ /dev/null @@ -1,6 +0,0 @@ -smb-server-do-not-require-delete-access-for-non-repl.patch -block-skip-sync_blockdev-on-surprise-removal-in-bdev.patch -sched-fair-only-update-stats-for-allowed-cpus-when-l.patch -crypto-algif_skcipher-force-synchronous-processing-o.patch -kvm-arm64-bound-used_lrs-when-flushing-the-pkvm-hyp-.patch -kvm-arm64-clear-__hyp_running_vcpu-when-flushing-the.patch