From: Greg Kroah-Hartman Date: Sun, 27 Aug 2023 19:15:11 +0000 (+0200) Subject: move 6.1 queue back after the release X-Git-Tag: v6.4.13~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b4c2f47eff296bac5af0048d41a5e95378a9994;p=thirdparty%2Fkernel%2Fstable-queue.git move 6.1 queue back after the release --- diff --git a/temp-6.1/alsa-ymfpci-fix-the-missing-snd_card_free-call-at-probe-error.patch b/queue-6.1/alsa-ymfpci-fix-the-missing-snd_card_free-call-at-probe-error.patch similarity index 100% rename from temp-6.1/alsa-ymfpci-fix-the-missing-snd_card_free-call-at-probe-error.patch rename to queue-6.1/alsa-ymfpci-fix-the-missing-snd_card_free-call-at-probe-error.patch diff --git a/temp-6.1/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-acp6x.patch b/queue-6.1/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-acp6x.patch similarity index 100% rename from temp-6.1/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-acp6x.patch rename to queue-6.1/asoc-amd-yc-add-vivobook-pro-15-to-quirks-list-for-acp6x.patch diff --git a/temp-6.1/asoc-cs35l41-correct-amp_gain_tlv-values.patch b/queue-6.1/asoc-cs35l41-correct-amp_gain_tlv-values.patch similarity index 100% rename from temp-6.1/asoc-cs35l41-correct-amp_gain_tlv-values.patch rename to queue-6.1/asoc-cs35l41-correct-amp_gain_tlv-values.patch diff --git a/temp-6.1/batman-adv-do-not-get-eth-header-before-batadv_check_management_packet.patch b/queue-6.1/batman-adv-do-not-get-eth-header-before-batadv_check_management_packet.patch similarity index 100% rename from temp-6.1/batman-adv-do-not-get-eth-header-before-batadv_check_management_packet.patch rename to queue-6.1/batman-adv-do-not-get-eth-header-before-batadv_check_management_packet.patch diff --git a/temp-6.1/batman-adv-don-t-increase-mtu-when-set-by-user.patch b/queue-6.1/batman-adv-don-t-increase-mtu-when-set-by-user.patch similarity index 100% rename from temp-6.1/batman-adv-don-t-increase-mtu-when-set-by-user.patch rename to queue-6.1/batman-adv-don-t-increase-mtu-when-set-by-user.patch diff --git a/temp-6.1/batman-adv-fix-batadv_v_ogm_aggr_send-memory-leak.patch b/queue-6.1/batman-adv-fix-batadv_v_ogm_aggr_send-memory-leak.patch similarity index 100% rename from temp-6.1/batman-adv-fix-batadv_v_ogm_aggr_send-memory-leak.patch rename to queue-6.1/batman-adv-fix-batadv_v_ogm_aggr_send-memory-leak.patch diff --git a/temp-6.1/batman-adv-fix-tt-global-entry-leak-when-client-roamed-back.patch b/queue-6.1/batman-adv-fix-tt-global-entry-leak-when-client-roamed-back.patch similarity index 100% rename from temp-6.1/batman-adv-fix-tt-global-entry-leak-when-client-roamed-back.patch rename to queue-6.1/batman-adv-fix-tt-global-entry-leak-when-client-roamed-back.patch diff --git a/temp-6.1/batman-adv-hold-rtnl-lock-during-mtu-update-via-netlink.patch b/queue-6.1/batman-adv-hold-rtnl-lock-during-mtu-update-via-netlink.patch similarity index 100% rename from temp-6.1/batman-adv-hold-rtnl-lock-during-mtu-update-via-netlink.patch rename to queue-6.1/batman-adv-hold-rtnl-lock-during-mtu-update-via-netlink.patch diff --git a/temp-6.1/batman-adv-trigger-events-for-auto-adjusted-mtu.patch b/queue-6.1/batman-adv-trigger-events-for-auto-adjusted-mtu.patch similarity index 100% rename from temp-6.1/batman-adv-trigger-events-for-auto-adjusted-mtu.patch rename to queue-6.1/batman-adv-trigger-events-for-auto-adjusted-mtu.patch diff --git a/temp-6.1/bonding-fix-macvlan-over-alb-bond-support.patch b/queue-6.1/bonding-fix-macvlan-over-alb-bond-support.patch similarity index 100% rename from temp-6.1/bonding-fix-macvlan-over-alb-bond-support.patch rename to queue-6.1/bonding-fix-macvlan-over-alb-bond-support.patch diff --git a/temp-6.1/can-isotp-fix-support-for-transmission-of-sf-without.patch b/queue-6.1/can-isotp-fix-support-for-transmission-of-sf-without.patch similarity index 100% rename from temp-6.1/can-isotp-fix-support-for-transmission-of-sf-without.patch rename to queue-6.1/can-isotp-fix-support-for-transmission-of-sf-without.patch diff --git a/temp-6.1/can-raw-add-missing-refcount-for-memory-leak-fix.patch b/queue-6.1/can-raw-add-missing-refcount-for-memory-leak-fix.patch similarity index 100% rename from temp-6.1/can-raw-add-missing-refcount-for-memory-leak-fix.patch rename to queue-6.1/can-raw-add-missing-refcount-for-memory-leak-fix.patch diff --git a/temp-6.1/can-raw-fix-lockdep-issue-in-raw_release.patch b/queue-6.1/can-raw-fix-lockdep-issue-in-raw_release.patch similarity index 100% rename from temp-6.1/can-raw-fix-lockdep-issue-in-raw_release.patch rename to queue-6.1/can-raw-fix-lockdep-issue-in-raw_release.patch diff --git a/temp-6.1/can-raw-fix-receiver-memory-leak.patch b/queue-6.1/can-raw-fix-receiver-memory-leak.patch similarity index 100% rename from temp-6.1/can-raw-fix-receiver-memory-leak.patch rename to queue-6.1/can-raw-fix-receiver-memory-leak.patch diff --git a/temp-6.1/cgroup-cpuset-free-dl-bw-in-case-can_attach-fails.patch b/queue-6.1/cgroup-cpuset-free-dl-bw-in-case-can_attach-fails.patch similarity index 100% rename from temp-6.1/cgroup-cpuset-free-dl-bw-in-case-can_attach-fails.patch rename to queue-6.1/cgroup-cpuset-free-dl-bw-in-case-can_attach-fails.patch diff --git a/temp-6.1/cgroup-cpuset-iterate-only-if-deadline-tasks-are-present.patch b/queue-6.1/cgroup-cpuset-iterate-only-if-deadline-tasks-are-present.patch similarity index 100% rename from temp-6.1/cgroup-cpuset-iterate-only-if-deadline-tasks-are-present.patch rename to queue-6.1/cgroup-cpuset-iterate-only-if-deadline-tasks-are-present.patch diff --git a/temp-6.1/cgroup-cpuset-rename-functions-dealing-with-deadline-accounting.patch b/queue-6.1/cgroup-cpuset-rename-functions-dealing-with-deadline-accounting.patch similarity index 100% rename from temp-6.1/cgroup-cpuset-rename-functions-dealing-with-deadline-accounting.patch rename to queue-6.1/cgroup-cpuset-rename-functions-dealing-with-deadline-accounting.patch diff --git a/temp-6.1/clk-fix-slab-out-of-bounds-error-in-devm_clk_release.patch b/queue-6.1/clk-fix-slab-out-of-bounds-error-in-devm_clk_release.patch similarity index 100% rename from temp-6.1/clk-fix-slab-out-of-bounds-error-in-devm_clk_release.patch rename to queue-6.1/clk-fix-slab-out-of-bounds-error-in-devm_clk_release.patch diff --git a/temp-6.1/dccp-annotate-data-races-in-dccp_poll.patch b/queue-6.1/dccp-annotate-data-races-in-dccp_poll.patch similarity index 100% rename from temp-6.1/dccp-annotate-data-races-in-dccp_poll.patch rename to queue-6.1/dccp-annotate-data-races-in-dccp_poll.patch diff --git a/temp-6.1/devlink-add-missing-unregister-linecard-notification.patch b/queue-6.1/devlink-add-missing-unregister-linecard-notification.patch similarity index 100% rename from temp-6.1/devlink-add-missing-unregister-linecard-notification.patch rename to queue-6.1/devlink-add-missing-unregister-linecard-notification.patch diff --git a/temp-6.1/devlink-move-code-to-a-dedicated-directory.patch b/queue-6.1/devlink-move-code-to-a-dedicated-directory.patch similarity index 100% rename from temp-6.1/devlink-move-code-to-a-dedicated-directory.patch rename to queue-6.1/devlink-move-code-to-a-dedicated-directory.patch diff --git a/temp-6.1/drm-aperture-remove-primary-argument.patch b/queue-6.1/drm-aperture-remove-primary-argument.patch similarity index 100% rename from temp-6.1/drm-aperture-remove-primary-argument.patch rename to queue-6.1/drm-aperture-remove-primary-argument.patch diff --git a/temp-6.1/drm-ast-use-drm_aperture_remove_conflicting_pci_fram.patch b/queue-6.1/drm-ast-use-drm_aperture_remove_conflicting_pci_fram.patch similarity index 100% rename from temp-6.1/drm-ast-use-drm_aperture_remove_conflicting_pci_fram.patch rename to queue-6.1/drm-ast-use-drm_aperture_remove_conflicting_pci_fram.patch diff --git a/temp-6.1/drm-display-dp-fix-the-dp-dsc-receiver-cap-size.patch b/queue-6.1/drm-display-dp-fix-the-dp-dsc-receiver-cap-size.patch similarity index 100% rename from temp-6.1/drm-display-dp-fix-the-dp-dsc-receiver-cap-size.patch rename to queue-6.1/drm-display-dp-fix-the-dp-dsc-receiver-cap-size.patch diff --git a/temp-6.1/drm-gma500-use-drm_aperture_remove_conflicting_pci_f.patch b/queue-6.1/drm-gma500-use-drm_aperture_remove_conflicting_pci_f.patch similarity index 100% rename from temp-6.1/drm-gma500-use-drm_aperture_remove_conflicting_pci_f.patch rename to queue-6.1/drm-gma500-use-drm_aperture_remove_conflicting_pci_f.patch diff --git a/temp-6.1/drm-i915-add-the-gen12_needs_ccs_aux_inv-helper.patch b/queue-6.1/drm-i915-add-the-gen12_needs_ccs_aux_inv-helper.patch similarity index 100% rename from temp-6.1/drm-i915-add-the-gen12_needs_ccs_aux_inv-helper.patch rename to queue-6.1/drm-i915-add-the-gen12_needs_ccs_aux_inv-helper.patch diff --git a/temp-6.1/drm-i915-dgfx-enable-d3cold-at-s2idle.patch b/queue-6.1/drm-i915-dgfx-enable-d3cold-at-s2idle.patch similarity index 100% rename from temp-6.1/drm-i915-dgfx-enable-d3cold-at-s2idle.patch rename to queue-6.1/drm-i915-dgfx-enable-d3cold-at-s2idle.patch diff --git a/temp-6.1/drm-i915-gt-ensure-memory-quiesced-before-invalidati.patch b/queue-6.1/drm-i915-gt-ensure-memory-quiesced-before-invalidati.patch similarity index 100% rename from temp-6.1/drm-i915-gt-ensure-memory-quiesced-before-invalidati.patch rename to queue-6.1/drm-i915-gt-ensure-memory-quiesced-before-invalidati.patch diff --git a/temp-6.1/drm-i915-gt-poll-aux-invalidation-register-bit-on-in.patch b/queue-6.1/drm-i915-gt-poll-aux-invalidation-register-bit-on-in.patch similarity index 100% rename from temp-6.1/drm-i915-gt-poll-aux-invalidation-register-bit-on-in.patch rename to queue-6.1/drm-i915-gt-poll-aux-invalidation-register-bit-on-in.patch diff --git a/temp-6.1/drm-i915-gt-support-aux-invalidation-on-all-engines.patch b/queue-6.1/drm-i915-gt-support-aux-invalidation-on-all-engines.patch similarity index 100% rename from temp-6.1/drm-i915-gt-support-aux-invalidation-on-all-engines.patch rename to queue-6.1/drm-i915-gt-support-aux-invalidation-on-all-engines.patch diff --git a/temp-6.1/drm-vmwgfx-fix-shader-stage-validation.patch b/queue-6.1/drm-vmwgfx-fix-shader-stage-validation.patch similarity index 100% rename from temp-6.1/drm-vmwgfx-fix-shader-stage-validation.patch rename to queue-6.1/drm-vmwgfx-fix-shader-stage-validation.patch diff --git a/temp-6.1/fbdev-radeon-use-pci-aperture-helpers.patch b/queue-6.1/fbdev-radeon-use-pci-aperture-helpers.patch similarity index 100% rename from temp-6.1/fbdev-radeon-use-pci-aperture-helpers.patch rename to queue-6.1/fbdev-radeon-use-pci-aperture-helpers.patch diff --git a/temp-6.1/hwmon-aquacomputer_d5next-add-selective-200ms-delay-after-sending-ctrl-report.patch b/queue-6.1/hwmon-aquacomputer_d5next-add-selective-200ms-delay-after-sending-ctrl-report.patch similarity index 100% rename from temp-6.1/hwmon-aquacomputer_d5next-add-selective-200ms-delay-after-sending-ctrl-report.patch rename to queue-6.1/hwmon-aquacomputer_d5next-add-selective-200ms-delay-after-sending-ctrl-report.patch diff --git a/temp-6.1/i40e-fix-potential-null-pointer-dereferencing-of-pf-.patch b/queue-6.1/i40e-fix-potential-null-pointer-dereferencing-of-pf-.patch similarity index 100% rename from temp-6.1/i40e-fix-potential-null-pointer-dereferencing-of-pf-.patch rename to queue-6.1/i40e-fix-potential-null-pointer-dereferencing-of-pf-.patch diff --git a/temp-6.1/ibmveth-use-dcbf-rather-than-dcbfl.patch b/queue-6.1/ibmveth-use-dcbf-rather-than-dcbfl.patch similarity index 100% rename from temp-6.1/ibmveth-use-dcbf-rather-than-dcbfl.patch rename to queue-6.1/ibmveth-use-dcbf-rather-than-dcbfl.patch diff --git a/temp-6.1/ice-fix-null-pointer-deref-during-vf-reset.patch b/queue-6.1/ice-fix-null-pointer-deref-during-vf-reset.patch similarity index 100% rename from temp-6.1/ice-fix-null-pointer-deref-during-vf-reset.patch rename to queue-6.1/ice-fix-null-pointer-deref-during-vf-reset.patch diff --git a/temp-6.1/ice-fix-receive-buffer-size-miscalculation.patch b/queue-6.1/ice-fix-receive-buffer-size-miscalculation.patch similarity index 100% rename from temp-6.1/ice-fix-receive-buffer-size-miscalculation.patch rename to queue-6.1/ice-fix-receive-buffer-size-miscalculation.patch diff --git a/temp-6.1/igb-avoid-starting-unnecessary-workqueues.patch b/queue-6.1/igb-avoid-starting-unnecessary-workqueues.patch similarity index 100% rename from temp-6.1/igb-avoid-starting-unnecessary-workqueues.patch rename to queue-6.1/igb-avoid-starting-unnecessary-workqueues.patch diff --git a/temp-6.1/igc-fix-the-typo-in-the-ptm-control-macro.patch b/queue-6.1/igc-fix-the-typo-in-the-ptm-control-macro.patch similarity index 100% rename from temp-6.1/igc-fix-the-typo-in-the-ptm-control-macro.patch rename to queue-6.1/igc-fix-the-typo-in-the-ptm-control-macro.patch diff --git a/temp-6.1/io_uring-extract-a-io_msg_install_complete-helper.patch b/queue-6.1/io_uring-extract-a-io_msg_install_complete-helper.patch similarity index 100% rename from temp-6.1/io_uring-extract-a-io_msg_install_complete-helper.patch rename to queue-6.1/io_uring-extract-a-io_msg_install_complete-helper.patch diff --git a/temp-6.1/io_uring-get-rid-of-double-locking.patch b/queue-6.1/io_uring-get-rid-of-double-locking.patch similarity index 100% rename from temp-6.1/io_uring-get-rid-of-double-locking.patch rename to queue-6.1/io_uring-get-rid-of-double-locking.patch diff --git a/temp-6.1/io_uring-msg_ring-fix-missing-lock-on-overflow-for-iopoll.patch b/queue-6.1/io_uring-msg_ring-fix-missing-lock-on-overflow-for-iopoll.patch similarity index 100% rename from temp-6.1/io_uring-msg_ring-fix-missing-lock-on-overflow-for-iopoll.patch rename to queue-6.1/io_uring-msg_ring-fix-missing-lock-on-overflow-for-iopoll.patch diff --git a/temp-6.1/io_uring-msg_ring-move-double-lock-unlock-helpers-higher-up.patch b/queue-6.1/io_uring-msg_ring-move-double-lock-unlock-helpers-higher-up.patch similarity index 100% rename from temp-6.1/io_uring-msg_ring-move-double-lock-unlock-helpers-higher-up.patch rename to queue-6.1/io_uring-msg_ring-move-double-lock-unlock-helpers-higher-up.patch diff --git a/temp-6.1/ipv4-fix-data-races-around-inet-inet_id.patch b/queue-6.1/ipv4-fix-data-races-around-inet-inet_id.patch similarity index 100% rename from temp-6.1/ipv4-fix-data-races-around-inet-inet_id.patch rename to queue-6.1/ipv4-fix-data-races-around-inet-inet_id.patch diff --git a/temp-6.1/ipvlan-fix-a-reference-count-leak-warning-in-ipvlan_.patch b/queue-6.1/ipvlan-fix-a-reference-count-leak-warning-in-ipvlan_.patch similarity index 100% rename from temp-6.1/ipvlan-fix-a-reference-count-leak-warning-in-ipvlan_.patch rename to queue-6.1/ipvlan-fix-a-reference-count-leak-warning-in-ipvlan_.patch diff --git a/temp-6.1/jbd2-fix-a-race-when-checking-checkpoint-buffer-busy.patch b/queue-6.1/jbd2-fix-a-race-when-checking-checkpoint-buffer-busy.patch similarity index 100% rename from temp-6.1/jbd2-fix-a-race-when-checking-checkpoint-buffer-busy.patch rename to queue-6.1/jbd2-fix-a-race-when-checking-checkpoint-buffer-busy.patch diff --git a/temp-6.1/jbd2-remove-journal_clean_one_cp_list.patch b/queue-6.1/jbd2-remove-journal_clean_one_cp_list.patch similarity index 100% rename from temp-6.1/jbd2-remove-journal_clean_one_cp_list.patch rename to queue-6.1/jbd2-remove-journal_clean_one_cp_list.patch diff --git a/temp-6.1/jbd2-remove-t_checkpoint_io_list.patch b/queue-6.1/jbd2-remove-t_checkpoint_io_list.patch similarity index 100% rename from temp-6.1/jbd2-remove-t_checkpoint_io_list.patch rename to queue-6.1/jbd2-remove-t_checkpoint_io_list.patch diff --git a/temp-6.1/kvm-x86-mmu-fix-an-sign-extension-bug-with-mmu_seq-that-hangs-vcpus.patch b/queue-6.1/kvm-x86-mmu-fix-an-sign-extension-bug-with-mmu_seq-that-hangs-vcpus.patch similarity index 100% rename from temp-6.1/kvm-x86-mmu-fix-an-sign-extension-bug-with-mmu_seq-that-hangs-vcpus.patch rename to queue-6.1/kvm-x86-mmu-fix-an-sign-extension-bug-with-mmu_seq-that-hangs-vcpus.patch diff --git a/temp-6.1/kvm-x86-preserve-tdp-mmu-roots-until-they-are-explicitly-invalidated.patch b/queue-6.1/kvm-x86-preserve-tdp-mmu-roots-until-they-are-explicitly-invalidated.patch similarity index 100% rename from temp-6.1/kvm-x86-preserve-tdp-mmu-roots-until-they-are-explicitly-invalidated.patch rename to queue-6.1/kvm-x86-preserve-tdp-mmu-roots-until-they-are-explicitly-invalidated.patch diff --git a/temp-6.1/lib-clz_ctz.c-fix-__clzdi2-and-__ctzdi2-for-32-bit-kernels.patch b/queue-6.1/lib-clz_ctz.c-fix-__clzdi2-and-__ctzdi2-for-32-bit-kernels.patch similarity index 100% rename from temp-6.1/lib-clz_ctz.c-fix-__clzdi2-and-__ctzdi2-for-32-bit-kernels.patch rename to queue-6.1/lib-clz_ctz.c-fix-__clzdi2-and-__ctzdi2-for-32-bit-kernels.patch diff --git a/temp-6.1/madvise-madvise_free_pte_range-don-t-use-mapcount-against-large-folio-for-sharing-check.patch b/queue-6.1/madvise-madvise_free_pte_range-don-t-use-mapcount-against-large-folio-for-sharing-check.patch similarity index 100% rename from temp-6.1/madvise-madvise_free_pte_range-don-t-use-mapcount-against-large-folio-for-sharing-check.patch rename to queue-6.1/madvise-madvise_free_pte_range-don-t-use-mapcount-against-large-folio-for-sharing-check.patch diff --git a/temp-6.1/media-vcodec-fix-potential-array-out-of-bounds-in-encoder-queue_setup.patch b/queue-6.1/media-vcodec-fix-potential-array-out-of-bounds-in-encoder-queue_setup.patch similarity index 100% rename from temp-6.1/media-vcodec-fix-potential-array-out-of-bounds-in-encoder-queue_setup.patch rename to queue-6.1/media-vcodec-fix-potential-array-out-of-bounds-in-encoder-queue_setup.patch diff --git a/temp-6.1/mips-cpu-features-enable-octeon_cache-by-cpu_type.patch b/queue-6.1/mips-cpu-features-enable-octeon_cache-by-cpu_type.patch similarity index 100% rename from temp-6.1/mips-cpu-features-enable-octeon_cache-by-cpu_type.patch rename to queue-6.1/mips-cpu-features-enable-octeon_cache-by-cpu_type.patch diff --git a/temp-6.1/mips-cpu-features-use-boot_cpu_type-for-cpu-type-bas.patch b/queue-6.1/mips-cpu-features-use-boot_cpu_type-for-cpu-type-bas.patch similarity index 100% rename from temp-6.1/mips-cpu-features-use-boot_cpu_type-for-cpu-type-bas.patch rename to queue-6.1/mips-cpu-features-use-boot_cpu_type-for-cpu-type-bas.patch diff --git a/temp-6.1/mlxsw-fix-the-size-of-virt_router_msb.patch b/queue-6.1/mlxsw-fix-the-size-of-virt_router_msb.patch similarity index 100% rename from temp-6.1/mlxsw-fix-the-size-of-virt_router_msb.patch rename to queue-6.1/mlxsw-fix-the-size-of-virt_router_msb.patch diff --git a/temp-6.1/mlxsw-pci-set-time-stamp-fields-also-when-its-type-i.patch b/queue-6.1/mlxsw-pci-set-time-stamp-fields-also-when-its-type-i.patch similarity index 100% rename from temp-6.1/mlxsw-pci-set-time-stamp-fields-also-when-its-type-i.patch rename to queue-6.1/mlxsw-pci-set-time-stamp-fields-also-when-its-type-i.patch diff --git a/temp-6.1/mlxsw-reg-fix-sspr-register-layout.patch b/queue-6.1/mlxsw-reg-fix-sspr-register-layout.patch similarity index 100% rename from temp-6.1/mlxsw-reg-fix-sspr-register-layout.patch rename to queue-6.1/mlxsw-reg-fix-sspr-register-layout.patch diff --git a/temp-6.1/mm-add-a-call-to-flush_cache_vmap-in-vmap_pfn.patch b/queue-6.1/mm-add-a-call-to-flush_cache_vmap-in-vmap_pfn.patch similarity index 100% rename from temp-6.1/mm-add-a-call-to-flush_cache_vmap-in-vmap_pfn.patch rename to queue-6.1/mm-add-a-call-to-flush_cache_vmap-in-vmap_pfn.patch diff --git a/temp-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch b/queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch similarity index 100% rename from temp-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch rename to queue-6.1/mm-gup-handle-cont-pte-hugetlb-pages-correctly-in-gup_must_unshare-via-gup-fast.patch diff --git a/temp-6.1/mm-ima-kexec-of-use-memblock_free_late-from-ima_free_kexec_buffer.patch b/queue-6.1/mm-ima-kexec-of-use-memblock_free_late-from-ima_free_kexec_buffer.patch similarity index 100% rename from temp-6.1/mm-ima-kexec-of-use-memblock_free_late-from-ima_free_kexec_buffer.patch rename to queue-6.1/mm-ima-kexec-of-use-memblock_free_late-from-ima_free_kexec_buffer.patch diff --git a/temp-6.1/mm-memory-failure-fix-unexpected-return-value-in-soft_offline_page.patch b/queue-6.1/mm-memory-failure-fix-unexpected-return-value-in-soft_offline_page.patch similarity index 100% rename from temp-6.1/mm-memory-failure-fix-unexpected-return-value-in-soft_offline_page.patch rename to queue-6.1/mm-memory-failure-fix-unexpected-return-value-in-soft_offline_page.patch diff --git a/temp-6.1/net-bcmgenet-fix-return-value-check-for-fixed_phy_re.patch b/queue-6.1/net-bcmgenet-fix-return-value-check-for-fixed_phy_re.patch similarity index 100% rename from temp-6.1/net-bcmgenet-fix-return-value-check-for-fixed_phy_re.patch rename to queue-6.1/net-bcmgenet-fix-return-value-check-for-fixed_phy_re.patch diff --git a/temp-6.1/net-bgmac-fix-return-value-check-for-fixed_phy_regis.patch b/queue-6.1/net-bgmac-fix-return-value-check-for-fixed_phy_regis.patch similarity index 100% rename from temp-6.1/net-bgmac-fix-return-value-check-for-fixed_phy_regis.patch rename to queue-6.1/net-bgmac-fix-return-value-check-for-fixed_phy_regis.patch diff --git a/temp-6.1/net-dsa-felix-fix-oversize-frame-dropping-for-always.patch b/queue-6.1/net-dsa-felix-fix-oversize-frame-dropping-for-always.patch similarity index 100% rename from temp-6.1/net-dsa-felix-fix-oversize-frame-dropping-for-always.patch rename to queue-6.1/net-dsa-felix-fix-oversize-frame-dropping-for-always.patch diff --git a/temp-6.1/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch b/queue-6.1/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch similarity index 100% rename from temp-6.1/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch rename to queue-6.1/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch diff --git a/temp-6.1/net-sched-fix-a-qdisc-modification-with-ambiguous-co.patch b/queue-6.1/net-sched-fix-a-qdisc-modification-with-ambiguous-co.patch similarity index 100% rename from temp-6.1/net-sched-fix-a-qdisc-modification-with-ambiguous-co.patch rename to queue-6.1/net-sched-fix-a-qdisc-modification-with-ambiguous-co.patch diff --git a/temp-6.1/net-validate-veth-and-vxcan-peer-ifindexes.patch b/queue-6.1/net-validate-veth-and-vxcan-peer-ifindexes.patch similarity index 100% rename from temp-6.1/net-validate-veth-and-vxcan-peer-ifindexes.patch rename to queue-6.1/net-validate-veth-and-vxcan-peer-ifindexes.patch diff --git a/temp-6.1/netfilter-nf_tables-fix-out-of-memory-error-handling.patch b/queue-6.1/netfilter-nf_tables-fix-out-of-memory-error-handling.patch similarity index 100% rename from temp-6.1/netfilter-nf_tables-fix-out-of-memory-error-handling.patch rename to queue-6.1/netfilter-nf_tables-fix-out-of-memory-error-handling.patch diff --git a/temp-6.1/netfilter-nf_tables-flush-pending-destroy-work-befor.patch b/queue-6.1/netfilter-nf_tables-flush-pending-destroy-work-befor.patch similarity index 100% rename from temp-6.1/netfilter-nf_tables-flush-pending-destroy-work-befor.patch rename to queue-6.1/netfilter-nf_tables-flush-pending-destroy-work-befor.patch diff --git a/temp-6.1/nfs-fix-a-use-after-free-in-nfs_direct_join_group.patch b/queue-6.1/nfs-fix-a-use-after-free-in-nfs_direct_join_group.patch similarity index 100% rename from temp-6.1/nfs-fix-a-use-after-free-in-nfs_direct_join_group.patch rename to queue-6.1/nfs-fix-a-use-after-free-in-nfs_direct_join_group.patch diff --git a/temp-6.1/nfs-use-vfs-setgid-helper.patch b/queue-6.1/nfs-use-vfs-setgid-helper.patch similarity index 100% rename from temp-6.1/nfs-use-vfs-setgid-helper.patch rename to queue-6.1/nfs-use-vfs-setgid-helper.patch diff --git a/temp-6.1/nfsd-fix-race-to-free_stateid-and-cl_revoked.patch b/queue-6.1/nfsd-fix-race-to-free_stateid-and-cl_revoked.patch similarity index 100% rename from temp-6.1/nfsd-fix-race-to-free_stateid-and-cl_revoked.patch rename to queue-6.1/nfsd-fix-race-to-free_stateid-and-cl_revoked.patch diff --git a/temp-6.1/nfsd-use-vfs-setgid-helper.patch b/queue-6.1/nfsd-use-vfs-setgid-helper.patch similarity index 100% rename from temp-6.1/nfsd-use-vfs-setgid-helper.patch rename to queue-6.1/nfsd-use-vfs-setgid-helper.patch diff --git a/temp-6.1/nfsv4-fix-dropped-lock-for-racing-open-and-delegation-return.patch b/queue-6.1/nfsv4-fix-dropped-lock-for-racing-open-and-delegation-return.patch similarity index 100% rename from temp-6.1/nfsv4-fix-dropped-lock-for-racing-open-and-delegation-return.patch rename to queue-6.1/nfsv4-fix-dropped-lock-for-racing-open-and-delegation-return.patch diff --git a/temp-6.1/nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch b/queue-6.1/nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch similarity index 100% rename from temp-6.1/nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch rename to queue-6.1/nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch diff --git a/temp-6.1/nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch b/queue-6.1/nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch similarity index 100% rename from temp-6.1/nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch rename to queue-6.1/nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch diff --git a/temp-6.1/octeontx2-af-sdp-fix-receive-link-config.patch b/queue-6.1/octeontx2-af-sdp-fix-receive-link-config.patch similarity index 100% rename from temp-6.1/octeontx2-af-sdp-fix-receive-link-config.patch rename to queue-6.1/octeontx2-af-sdp-fix-receive-link-config.patch diff --git a/temp-6.1/of-dynamic-refactor-action-prints-to-not-use-pof-inside-devtree_lock.patch b/queue-6.1/of-dynamic-refactor-action-prints-to-not-use-pof-inside-devtree_lock.patch similarity index 100% rename from temp-6.1/of-dynamic-refactor-action-prints-to-not-use-pof-inside-devtree_lock.patch rename to queue-6.1/of-dynamic-refactor-action-prints-to-not-use-pof-inside-devtree_lock.patch diff --git a/temp-6.1/of-unittest-fix-expect-for-parse_phandle_with_args_map-test.patch b/queue-6.1/of-unittest-fix-expect-for-parse_phandle_with_args_map-test.patch similarity index 100% rename from temp-6.1/of-unittest-fix-expect-for-parse_phandle_with_args_map-test.patch rename to queue-6.1/of-unittest-fix-expect-for-parse_phandle_with_args_map-test.patch diff --git a/temp-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessar.patch b/queue-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessar.patch similarity index 100% rename from temp-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessar.patch rename to queue-6.1/pci-acpiphp-reassign-resources-on-bridge-if-necessar.patch diff --git a/temp-6.1/pci-acpiphp-use-pci_assign_unassigned_bridge_resources-only-for-non-root-bus.patch b/queue-6.1/pci-acpiphp-use-pci_assign_unassigned_bridge_resources-only-for-non-root-bus.patch similarity index 100% rename from temp-6.1/pci-acpiphp-use-pci_assign_unassigned_bridge_resources-only-for-non-root-bus.patch rename to queue-6.1/pci-acpiphp-use-pci_assign_unassigned_bridge_resources-only-for-non-root-bus.patch diff --git a/temp-6.1/pinctrl-amd-mask-wake-bits-on-probe-again.patch b/queue-6.1/pinctrl-amd-mask-wake-bits-on-probe-again.patch similarity index 100% rename from temp-6.1/pinctrl-amd-mask-wake-bits-on-probe-again.patch rename to queue-6.1/pinctrl-amd-mask-wake-bits-on-probe-again.patch diff --git a/temp-6.1/platform-x86-ideapad-laptop-add-support-for-new-hotkeys-found-on-thinkbook-14s-yoga-itl.patch b/queue-6.1/platform-x86-ideapad-laptop-add-support-for-new-hotkeys-found-on-thinkbook-14s-yoga-itl.patch similarity index 100% rename from temp-6.1/platform-x86-ideapad-laptop-add-support-for-new-hotkeys-found-on-thinkbook-14s-yoga-itl.patch rename to queue-6.1/platform-x86-ideapad-laptop-add-support-for-new-hotkeys-found-on-thinkbook-14s-yoga-itl.patch diff --git a/temp-6.1/radix-tree-remove-unused-variable.patch b/queue-6.1/radix-tree-remove-unused-variable.patch similarity index 100% rename from temp-6.1/radix-tree-remove-unused-variable.patch rename to queue-6.1/radix-tree-remove-unused-variable.patch diff --git a/temp-6.1/revert-ice-fix-ice-vf-reset-during-iavf-initializati.patch b/queue-6.1/revert-ice-fix-ice-vf-reset-during-iavf-initializati.patch similarity index 100% rename from temp-6.1/revert-ice-fix-ice-vf-reset-during-iavf-initializati.patch rename to queue-6.1/revert-ice-fix-ice-vf-reset-during-iavf-initializati.patch diff --git a/temp-6.1/riscv-fix-build-errors-using-binutils2.37-toolchains.patch b/queue-6.1/riscv-fix-build-errors-using-binutils2.37-toolchains.patch similarity index 100% rename from temp-6.1/riscv-fix-build-errors-using-binutils2.37-toolchains.patch rename to queue-6.1/riscv-fix-build-errors-using-binutils2.37-toolchains.patch diff --git a/temp-6.1/riscv-handle-zicsr-zifencei-issue-between-gcc-and-binutils.patch b/queue-6.1/riscv-handle-zicsr-zifencei-issue-between-gcc-and-binutils.patch similarity index 100% rename from temp-6.1/riscv-handle-zicsr-zifencei-issue-between-gcc-and-binutils.patch rename to queue-6.1/riscv-handle-zicsr-zifencei-issue-between-gcc-and-binutils.patch diff --git a/temp-6.1/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch b/queue-6.1/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch similarity index 100% rename from temp-6.1/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch rename to queue-6.1/rtnetlink-reject-negative-ifindexes-in-rtm_newlink.patch diff --git a/temp-6.1/s390-zcrypt-fix-reply-buffer-calculations-for-cca-re.patch b/queue-6.1/s390-zcrypt-fix-reply-buffer-calculations-for-cca-re.patch similarity index 100% rename from temp-6.1/s390-zcrypt-fix-reply-buffer-calculations-for-cca-re.patch rename to queue-6.1/s390-zcrypt-fix-reply-buffer-calculations-for-cca-re.patch diff --git a/temp-6.1/s390-zcrypt-remove-unnecessary-void-conversions.patch b/queue-6.1/s390-zcrypt-remove-unnecessary-void-conversions.patch similarity index 100% rename from temp-6.1/s390-zcrypt-remove-unnecessary-void-conversions.patch rename to queue-6.1/s390-zcrypt-remove-unnecessary-void-conversions.patch diff --git a/temp-6.1/sched-cpuset-bring-back-cpuset_mutex.patch b/queue-6.1/sched-cpuset-bring-back-cpuset_mutex.patch similarity index 100% rename from temp-6.1/sched-cpuset-bring-back-cpuset_mutex.patch rename to queue-6.1/sched-cpuset-bring-back-cpuset_mutex.patch diff --git a/temp-6.1/sched-cpuset-keep-track-of-sched_deadline-task-in-cpusets.patch b/queue-6.1/sched-cpuset-keep-track-of-sched_deadline-task-in-cpusets.patch similarity index 100% rename from temp-6.1/sched-cpuset-keep-track-of-sched_deadline-task-in-cpusets.patch rename to queue-6.1/sched-cpuset-keep-track-of-sched_deadline-task-in-cpusets.patch diff --git a/temp-6.1/sched-deadline-create-dl-bw-alloc-free-check-overflow-interface.patch b/queue-6.1/sched-deadline-create-dl-bw-alloc-free-check-overflow-interface.patch similarity index 100% rename from temp-6.1/sched-deadline-create-dl-bw-alloc-free-check-overflow-interface.patch rename to queue-6.1/sched-deadline-create-dl-bw-alloc-free-check-overflow-interface.patch diff --git a/temp-6.1/selftests-bonding-do-not-set-port-down-before-adding.patch b/queue-6.1/selftests-bonding-do-not-set-port-down-before-adding.patch similarity index 100% rename from temp-6.1/selftests-bonding-do-not-set-port-down-before-adding.patch rename to queue-6.1/selftests-bonding-do-not-set-port-down-before-adding.patch diff --git a/temp-6.1/selftests-mlxsw-fix-test-failure-on-spectrum-4.patch b/queue-6.1/selftests-mlxsw-fix-test-failure-on-spectrum-4.patch similarity index 100% rename from temp-6.1/selftests-mlxsw-fix-test-failure-on-spectrum-4.patch rename to queue-6.1/selftests-mlxsw-fix-test-failure-on-spectrum-4.patch diff --git a/temp-6.1/selftests-net-mv-bpf-nat6to4.c-to-net-folder.patch b/queue-6.1/selftests-net-mv-bpf-nat6to4.c-to-net-folder.patch similarity index 100% rename from temp-6.1/selftests-net-mv-bpf-nat6to4.c-to-net-folder.patch rename to queue-6.1/selftests-net-mv-bpf-nat6to4.c-to-net-folder.patch diff --git a/temp-6.1/selinux-set-next-pointer-before-attaching-to-list.patch b/queue-6.1/selinux-set-next-pointer-before-attaching-to-list.patch similarity index 100% rename from temp-6.1/selinux-set-next-pointer-before-attaching-to-list.patch rename to queue-6.1/selinux-set-next-pointer-before-attaching-to-list.patch diff --git a/temp-6.1/series b/queue-6.1/series similarity index 96% rename from temp-6.1/series rename to queue-6.1/series index 33aa8f1addb..d4fa43d9a5e 100644 --- a/temp-6.1/series +++ b/queue-6.1/series @@ -1,7 +1,3 @@ -objtool-x86-fix-srso-mess.patch -revert-f2fs-don-t-reset-unchangable-mount-option-in-f2fs_remount.patch -revert-f2fs-fix-to-set-flush_merge-opt-and-show-noflush_merge.patch -revert-f2fs-fix-to-do-sanity-check-on-direct-node-in-truncate_dnode.patch nfsv4.2-fix-error-handling-in-nfs42_proc_getxattr.patch nfsv4-fix-out-path-in-__nfs4_get_acl_uncached.patch xprtrdma-remap-receive-buffers-after-a-reconnect.patch diff --git a/temp-6.1/shmem-fix-smaps-bug-sleeping-while-atomic.patch b/queue-6.1/shmem-fix-smaps-bug-sleeping-while-atomic.patch similarity index 100% rename from temp-6.1/shmem-fix-smaps-bug-sleeping-while-atomic.patch rename to queue-6.1/shmem-fix-smaps-bug-sleeping-while-atomic.patch diff --git a/temp-6.1/sock-annotate-data-races-around-prot-memory_pressure.patch b/queue-6.1/sock-annotate-data-races-around-prot-memory_pressure.patch similarity index 100% rename from temp-6.1/sock-annotate-data-races-around-prot-memory_pressure.patch rename to queue-6.1/sock-annotate-data-races-around-prot-memory_pressure.patch diff --git a/temp-6.1/thunderbolt-fix-thunderbolt-3-display-flickering-issue-on-2nd-hot-plug-onwards.patch b/queue-6.1/thunderbolt-fix-thunderbolt-3-display-flickering-issue-on-2nd-hot-plug-onwards.patch similarity index 100% rename from temp-6.1/thunderbolt-fix-thunderbolt-3-display-flickering-issue-on-2nd-hot-plug-onwards.patch rename to queue-6.1/thunderbolt-fix-thunderbolt-3-display-flickering-issue-on-2nd-hot-plug-onwards.patch diff --git a/temp-6.1/tracing-fix-cpu-buffers-unavailable-due-to-record_di.patch b/queue-6.1/tracing-fix-cpu-buffers-unavailable-due-to-record_di.patch similarity index 100% rename from temp-6.1/tracing-fix-cpu-buffers-unavailable-due-to-record_di.patch rename to queue-6.1/tracing-fix-cpu-buffers-unavailable-due-to-record_di.patch diff --git a/temp-6.1/tracing-fix-memleak-due-to-race-between-current_trac.patch b/queue-6.1/tracing-fix-memleak-due-to-race-between-current_trac.patch similarity index 100% rename from temp-6.1/tracing-fix-memleak-due-to-race-between-current_trac.patch rename to queue-6.1/tracing-fix-memleak-due-to-race-between-current_trac.patch diff --git a/temp-6.1/ublk-remove-check-io_uring_f_sqe128-in-ublk_ch_uring_cmd.patch b/queue-6.1/ublk-remove-check-io_uring_f_sqe128-in-ublk_ch_uring_cmd.patch similarity index 100% rename from temp-6.1/ublk-remove-check-io_uring_f_sqe128-in-ublk_ch_uring_cmd.patch rename to queue-6.1/ublk-remove-check-io_uring_f_sqe128-in-ublk_ch_uring_cmd.patch diff --git a/temp-6.1/video-aperture-move-vga-handling-to-pci-function.patch b/queue-6.1/video-aperture-move-vga-handling-to-pci-function.patch similarity index 100% rename from temp-6.1/video-aperture-move-vga-handling-to-pci-function.patch rename to queue-6.1/video-aperture-move-vga-handling-to-pci-function.patch diff --git a/temp-6.1/video-aperture-only-kick-vgacon-when-the-pdev-is-dec.patch b/queue-6.1/video-aperture-only-kick-vgacon-when-the-pdev-is-dec.patch similarity index 100% rename from temp-6.1/video-aperture-only-kick-vgacon-when-the-pdev-is-dec.patch rename to queue-6.1/video-aperture-only-kick-vgacon-when-the-pdev-is-dec.patch diff --git a/temp-6.1/wifi-mac80211-limit-reorder_buf_filtered-to-avoid-ubsan-warning.patch b/queue-6.1/wifi-mac80211-limit-reorder_buf_filtered-to-avoid-ubsan-warning.patch similarity index 100% rename from temp-6.1/wifi-mac80211-limit-reorder_buf_filtered-to-avoid-ubsan-warning.patch rename to queue-6.1/wifi-mac80211-limit-reorder_buf_filtered-to-avoid-ubsan-warning.patch diff --git a/temp-6.1/x86-fpu-invalidate-fpu-state-correctly-on-exec.patch b/queue-6.1/x86-fpu-invalidate-fpu-state-correctly-on-exec.patch similarity index 100% rename from temp-6.1/x86-fpu-invalidate-fpu-state-correctly-on-exec.patch rename to queue-6.1/x86-fpu-invalidate-fpu-state-correctly-on-exec.patch diff --git a/temp-6.1/x86-fpu-set-x86_feature_osxsave-feature-after-enabling-osxsave-in-cr4.patch b/queue-6.1/x86-fpu-set-x86_feature_osxsave-feature-after-enabling-osxsave-in-cr4.patch similarity index 100% rename from temp-6.1/x86-fpu-set-x86_feature_osxsave-feature-after-enabling-osxsave-in-cr4.patch rename to queue-6.1/x86-fpu-set-x86_feature_osxsave-feature-after-enabling-osxsave-in-cr4.patch diff --git a/temp-6.1/xprtrdma-remap-receive-buffers-after-a-reconnect.patch b/queue-6.1/xprtrdma-remap-receive-buffers-after-a-reconnect.patch similarity index 100% rename from temp-6.1/xprtrdma-remap-receive-buffers-after-a-reconnect.patch rename to queue-6.1/xprtrdma-remap-receive-buffers-after-a-reconnect.patch diff --git a/temp-6.1/objtool-x86-fix-srso-mess.patch b/temp-6.1/objtool-x86-fix-srso-mess.patch deleted file mode 100644 index 6530a52c204..00000000000 --- a/temp-6.1/objtool-x86-fix-srso-mess.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 4ae68b26c3ab5a82aa271e6e9fc9b1a06e1d6b40 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra -Date: Mon, 14 Aug 2023 13:44:29 +0200 -Subject: objtool/x86: Fix SRSO mess - -From: Peter Zijlstra - -commit 4ae68b26c3ab5a82aa271e6e9fc9b1a06e1d6b40 upstream. - -Objtool --rethunk does two things: - - - it collects all (tail) call's of __x86_return_thunk and places them - into .return_sites. These are typically compiler generated, but - RET also emits this same. - - - it fudges the validation of the __x86_return_thunk symbol; because - this symbol is inside another instruction, it can't actually find - the instruction pointed to by the symbol offset and gets upset. - -Because these two things pertained to the same symbol, there was no -pressing need to separate these two separate things. - -However, alas, along comes SRSO and more crazy things to deal with -appeared. - -The SRSO patch itself added the following symbol names to identify as -rethunk: - - 'srso_untrain_ret', 'srso_safe_ret' and '__ret' - -Where '__ret' is the old retbleed return thunk, 'srso_safe_ret' is a -new similarly embedded return thunk, and 'srso_untrain_ret' is -completely unrelated to anything the above does (and was only included -because of that INT3 vs UD2 issue fixed previous). - -Clear things up by adding a second category for the embedded instruction -thing. - -Fixes: fb3bd914b3ec ("x86/srso: Add a Speculative RAS Overflow mitigation") -Signed-off-by: Peter Zijlstra (Intel) -Signed-off-by: Borislav Petkov (AMD) -Link: https://lore.kernel.org/r/20230814121148.704502245@infradead.org -Signed-off-by: Josh Poimboeuf -Signed-off-by: Greg Kroah-Hartman ---- - tools/objtool/arch/x86/decode.c | 11 +++++++---- - tools/objtool/check.c | 22 +++++++++++++++++++++- - tools/objtool/include/objtool/arch.h | 1 + - tools/objtool/include/objtool/elf.h | 1 + - 4 files changed, 30 insertions(+), 5 deletions(-) - ---- a/tools/objtool/arch/x86/decode.c -+++ b/tools/objtool/arch/x86/decode.c -@@ -796,8 +796,11 @@ bool arch_is_retpoline(struct symbol *sy - - bool arch_is_rethunk(struct symbol *sym) - { -- return !strcmp(sym->name, "__x86_return_thunk") || -- !strcmp(sym->name, "srso_untrain_ret") || -- !strcmp(sym->name, "srso_safe_ret") || -- !strcmp(sym->name, "retbleed_return_thunk"); -+ return !strcmp(sym->name, "__x86_return_thunk"); -+} -+ -+bool arch_is_embedded_insn(struct symbol *sym) -+{ -+ return !strcmp(sym->name, "retbleed_return_thunk") || -+ !strcmp(sym->name, "srso_safe_ret"); - } ---- a/tools/objtool/check.c -+++ b/tools/objtool/check.c -@@ -1164,16 +1164,33 @@ static int add_ignore_alternatives(struc - return 0; - } - -+/* -+ * Symbols that replace INSN_CALL_DYNAMIC, every (tail) call to such a symbol -+ * will be added to the .retpoline_sites section. -+ */ - __weak bool arch_is_retpoline(struct symbol *sym) - { - return false; - } - -+/* -+ * Symbols that replace INSN_RETURN, every (tail) call to such a symbol -+ * will be added to the .return_sites section. -+ */ - __weak bool arch_is_rethunk(struct symbol *sym) - { - return false; - } - -+/* -+ * Symbols that are embedded inside other instructions, because sometimes crazy -+ * code exists. These are mostly ignored for validation purposes. -+ */ -+__weak bool arch_is_embedded_insn(struct symbol *sym) -+{ -+ return false; -+} -+ - #define NEGATIVE_RELOC ((void *)-1L) - - static struct reloc *insn_reloc(struct objtool_file *file, struct instruction *insn) -@@ -1437,7 +1454,7 @@ static int add_jump_destinations(struct - * middle of another instruction. Objtool only - * knows about the outer instruction. - */ -- if (sym && sym->return_thunk) { -+ if (sym && sym->embedded_insn) { - add_return_call(file, insn, false); - continue; - } -@@ -2327,6 +2344,9 @@ static int classify_symbols(struct objto - if (arch_is_rethunk(func)) - func->return_thunk = true; - -+ if (arch_is_embedded_insn(func)) -+ func->embedded_insn = true; -+ - if (!strcmp(func->name, "__fentry__")) - func->fentry = true; - ---- a/tools/objtool/include/objtool/arch.h -+++ b/tools/objtool/include/objtool/arch.h -@@ -90,6 +90,7 @@ int arch_decode_hint_reg(u8 sp_reg, int - - bool arch_is_retpoline(struct symbol *sym); - bool arch_is_rethunk(struct symbol *sym); -+bool arch_is_embedded_insn(struct symbol *sym); - - int arch_rewrite_retpolines(struct objtool_file *file); - ---- a/tools/objtool/include/objtool/elf.h -+++ b/tools/objtool/include/objtool/elf.h -@@ -60,6 +60,7 @@ struct symbol { - u8 return_thunk : 1; - u8 fentry : 1; - u8 profiling_func : 1; -+ u8 embedded_insn : 1; - struct list_head pv_target; - }; - diff --git a/temp-6.1/revert-f2fs-don-t-reset-unchangable-mount-option-in-f2fs_remount.patch b/temp-6.1/revert-f2fs-don-t-reset-unchangable-mount-option-in-f2fs_remount.patch deleted file mode 100644 index fb1aabe7fff..00000000000 --- a/temp-6.1/revert-f2fs-don-t-reset-unchangable-mount-option-in-f2fs_remount.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 569d490fe49ba3a309e7bcf32236cb5a3ee9662f Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Sat, 26 Aug 2023 17:28:48 +0200 -Subject: Revert "f2fs: don't reset unchangable mount option in f2fs_remount()" - -From: Greg Kroah-Hartman - -This reverts commit e2fb24ce37caeaecff08af4e9967c8462624312b which is -commit 458c15dfbce62c35fefd9ca637b20a051309c9f1 upstream. - -Something is currently broken in the f2fs code, Guenter has reported -boot problems with it for a few releases now, so revert the most recent -f2fs changes in the hope to get this back to a working filesystem. - -Reported-by: Guenter Roeck -Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net -Cc: Chao Yu -Cc: Jaegeuk Kim -Cc: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/super.c | 30 ++++++++++++------------------ - 1 file changed, 12 insertions(+), 18 deletions(-) - ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -2040,22 +2040,9 @@ static int f2fs_show_options(struct seq_ - return 0; - } - --static void default_options(struct f2fs_sb_info *sbi, bool remount) -+static void default_options(struct f2fs_sb_info *sbi) - { - /* init some FS parameters */ -- if (!remount) { -- set_opt(sbi, READ_EXTENT_CACHE); -- clear_opt(sbi, DISABLE_CHECKPOINT); -- -- if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi)) -- set_opt(sbi, DISCARD); -- -- if (f2fs_sb_has_blkzoned(sbi)) -- F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_SECTION; -- else -- F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_BLOCK; -- } -- - if (f2fs_sb_has_readonly(sbi)) - F2FS_OPTION(sbi).active_logs = NR_CURSEG_RO_TYPE; - else -@@ -2078,16 +2065,23 @@ static void default_options(struct f2fs_ - set_opt(sbi, INLINE_XATTR); - set_opt(sbi, INLINE_DATA); - set_opt(sbi, INLINE_DENTRY); -+ set_opt(sbi, READ_EXTENT_CACHE); - set_opt(sbi, NOHEAP); -+ clear_opt(sbi, DISABLE_CHECKPOINT); - set_opt(sbi, MERGE_CHECKPOINT); - F2FS_OPTION(sbi).unusable_cap = 0; - sbi->sb->s_flags |= SB_LAZYTIME; - if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) - set_opt(sbi, FLUSH_MERGE); -- if (f2fs_sb_has_blkzoned(sbi)) -+ if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi)) -+ set_opt(sbi, DISCARD); -+ if (f2fs_sb_has_blkzoned(sbi)) { - F2FS_OPTION(sbi).fs_mode = FS_MODE_LFS; -- else -+ F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_SECTION; -+ } else { - F2FS_OPTION(sbi).fs_mode = FS_MODE_ADAPTIVE; -+ F2FS_OPTION(sbi).discard_unit = DISCARD_UNIT_BLOCK; -+ } - - #ifdef CONFIG_F2FS_FS_XATTR - set_opt(sbi, XATTR_USER); -@@ -2259,7 +2253,7 @@ static int f2fs_remount(struct super_blo - clear_sbi_flag(sbi, SBI_NEED_SB_WRITE); - } - -- default_options(sbi, true); -+ default_options(sbi); - - /* parse mount options */ - err = parse_options(sb, data, true); -@@ -4156,7 +4150,7 @@ try_onemore: - sbi->s_chksum_seed = f2fs_chksum(sbi, ~0, raw_super->uuid, - sizeof(raw_super->uuid)); - -- default_options(sbi, false); -+ default_options(sbi); - /* parse mount options */ - options = kstrdup((const char *)data, GFP_KERNEL); - if (data && !options) { diff --git a/temp-6.1/revert-f2fs-fix-to-do-sanity-check-on-direct-node-in-truncate_dnode.patch b/temp-6.1/revert-f2fs-fix-to-do-sanity-check-on-direct-node-in-truncate_dnode.patch deleted file mode 100644 index 0aaa35e9daf..00000000000 --- a/temp-6.1/revert-f2fs-fix-to-do-sanity-check-on-direct-node-in-truncate_dnode.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 26cb3bf5b61a2f7bd7d791a92e7b34408eabf13c Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Sat, 26 Aug 2023 17:29:00 +0200 -Subject: Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()" - -From: Greg Kroah-Hartman - -This reverts commit a78a8bcdc26de5ef3a0ee27c9c6c512e54a6051c which is -commit a6ec83786ab9f13f25fb18166dee908845713a95 upstream. - -Something is currently broken in the f2fs code, Guenter has reported -boot problems with it for a few releases now, so revert the most recent -f2fs changes in the hope to get this back to a working filesystem. - -Reported-by: Guenter Roeck -Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net -Cc: Chao Yu -Cc: Jaegeuk Kim -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/f2fs.h | 1 + - fs/f2fs/file.c | 5 +++++ - fs/f2fs/node.c | 14 ++------------ - include/linux/f2fs_fs.h | 1 - - 4 files changed, 8 insertions(+), 13 deletions(-) - ---- a/fs/f2fs/f2fs.h -+++ b/fs/f2fs/f2fs.h -@@ -3431,6 +3431,7 @@ static inline bool __is_valid_data_blkad - * file.c - */ - int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync); -+void f2fs_truncate_data_blocks(struct dnode_of_data *dn); - int f2fs_do_truncate_blocks(struct inode *inode, u64 from, bool lock); - int f2fs_truncate_blocks(struct inode *inode, u64 from, bool lock); - int f2fs_truncate(struct inode *inode); ---- a/fs/f2fs/file.c -+++ b/fs/f2fs/file.c -@@ -628,6 +628,11 @@ void f2fs_truncate_data_blocks_range(str - dn->ofs_in_node, nr_free); - } - -+void f2fs_truncate_data_blocks(struct dnode_of_data *dn) -+{ -+ f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode)); -+} -+ - static int truncate_partial_data_page(struct inode *inode, u64 from, - bool cache_only) - { ---- a/fs/f2fs/node.c -+++ b/fs/f2fs/node.c -@@ -923,7 +923,6 @@ static int truncate_node(struct dnode_of - - static int truncate_dnode(struct dnode_of_data *dn) - { -- struct f2fs_sb_info *sbi = F2FS_I_SB(dn->inode); - struct page *page; - int err; - -@@ -931,25 +930,16 @@ static int truncate_dnode(struct dnode_o - return 1; - - /* get direct node */ -- page = f2fs_get_node_page(sbi, dn->nid); -+ page = f2fs_get_node_page(F2FS_I_SB(dn->inode), dn->nid); - if (PTR_ERR(page) == -ENOENT) - return 1; - else if (IS_ERR(page)) - return PTR_ERR(page); - -- if (IS_INODE(page) || ino_of_node(page) != dn->inode->i_ino) { -- f2fs_err(sbi, "incorrect node reference, ino: %lu, nid: %u, ino_of_node: %u", -- dn->inode->i_ino, dn->nid, ino_of_node(page)); -- set_sbi_flag(sbi, SBI_NEED_FSCK); -- f2fs_handle_error(sbi, ERROR_INVALID_NODE_REFERENCE); -- f2fs_put_page(page, 1); -- return -EFSCORRUPTED; -- } -- - /* Make dnode_of_data for parameter */ - dn->node_page = page; - dn->ofs_in_node = 0; -- f2fs_truncate_data_blocks_range(dn, ADDRS_PER_BLOCK(dn->inode)); -+ f2fs_truncate_data_blocks(dn); - err = truncate_node(dn); - if (err) { - f2fs_put_page(page, 1); ---- a/include/linux/f2fs_fs.h -+++ b/include/linux/f2fs_fs.h -@@ -104,7 +104,6 @@ enum f2fs_error { - ERROR_INCONSISTENT_SIT, - ERROR_CORRUPTED_VERITY_XATTR, - ERROR_CORRUPTED_XATTR, -- ERROR_INVALID_NODE_REFERENCE, - ERROR_MAX, - }; - diff --git a/temp-6.1/revert-f2fs-fix-to-set-flush_merge-opt-and-show-noflush_merge.patch b/temp-6.1/revert-f2fs-fix-to-set-flush_merge-opt-and-show-noflush_merge.patch deleted file mode 100644 index 7223f861df1..00000000000 --- a/temp-6.1/revert-f2fs-fix-to-set-flush_merge-opt-and-show-noflush_merge.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0f0afb4610c6ab6375157376f2bc26356fd2d615 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman -Date: Sat, 26 Aug 2023 17:28:54 +0200 -Subject: Revert "f2fs: fix to set flush_merge opt and show noflush_merge" - -From: Greg Kroah-Hartman - -This reverts commit 6ba0594a81f91d6fd8ca9bd4ad23aa1618635a0f which is -commit 967eaad1fed5f6335ea97a47d45214744dc57925 upstream. - -Something is currently broken in the f2fs code, Guenter has reported -boot problems with it for a few releases now, so revert the most recent -f2fs changes in the hope to get this back to a working filesystem. - -Reported-by: Guenter Roeck -Link: https://lore.kernel.org/r/b392e1a8-b987-4993-bd45-035db9415a6e@roeck-us.net -Cc: Chao Yu -Cc: Jaegeuk Kim -Cc: Yangtao Li -Cc: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - fs/f2fs/super.c | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) - ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -1347,12 +1347,6 @@ default_check: - return -EINVAL; - } - -- if ((f2fs_sb_has_readonly(sbi) || f2fs_readonly(sbi->sb)) && -- test_opt(sbi, FLUSH_MERGE)) { -- f2fs_err(sbi, "FLUSH_MERGE not compatible with readonly mode"); -- return -EINVAL; -- } -- - if (f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) { - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; -@@ -1939,10 +1933,8 @@ static int f2fs_show_options(struct seq_ - seq_puts(seq, ",inline_dentry"); - else - seq_puts(seq, ",noinline_dentry"); -- if (test_opt(sbi, FLUSH_MERGE)) -+ if (!f2fs_readonly(sbi->sb) && test_opt(sbi, FLUSH_MERGE)) - seq_puts(seq, ",flush_merge"); -- else -- seq_puts(seq, ",noflush_merge"); - if (test_opt(sbi, NOBARRIER)) - seq_puts(seq, ",nobarrier"); - if (test_opt(sbi, FASTBOOT)) -@@ -2071,8 +2063,7 @@ static void default_options(struct f2fs_ - set_opt(sbi, MERGE_CHECKPOINT); - F2FS_OPTION(sbi).unusable_cap = 0; - sbi->sb->s_flags |= SB_LAZYTIME; -- if (!f2fs_sb_has_readonly(sbi) && !f2fs_readonly(sbi->sb)) -- set_opt(sbi, FLUSH_MERGE); -+ set_opt(sbi, FLUSH_MERGE); - if (f2fs_hw_support_discard(sbi) || f2fs_hw_should_discard(sbi)) - set_opt(sbi, DISCARD); - if (f2fs_sb_has_blkzoned(sbi)) {