From f0ff51d67edad5cc1eb89c9d80a8ee7d65b92123 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 28 Oct 2022 13:05:45 +0200 Subject: [PATCH] move 5.10 queue back into place --- .../acpi-extlog-handle-multiple-records.patch | 0 ...ght-native-for-more-tongfang-devices.patch | 0 ...80-trogdor-fixup-modem-memory-region.patch | 0 ...ta-remove-aes-hwcap-for-compat-tasks.patch | 0 ...ve-store_cpu_topology-to-shared-code.patch | 0 .../ata-ahci-imx-fix-module_alias.patch | 0 ...em_max_slots-with-sata_pmp_max_ports.patch | 0 ...s_add-after-wb_normal-is-initialized.patch | 0 ...wb-wc-is-always-set-to-1-in-wbt_init.patch | 0 ...ing-of-wbt_update_limits-in-wbt_init.patch | 0 ...sing-of-delayed-data-refs-during-bac.patch | 0 ...sing-of-delayed-tree-block-refs-duri.patch | 0 ...fix-xid-leak-in-cifs_copy_file_range.patch | 0 .../cifs-fix-xid-leak-in-cifs_flock.patch | 0 ...fix-xid-leak-in-cifs_ses_add_channel.patch | 0 ...q-qcom-fix-memory-leak-in-error-path.patch | 0 ...ix-writes-in-read-only-memory-region.patch | 0 ...-mxs-dma-remove-the-unused-.id_table.patch | 0 ...ine-mxs-use-platform_driver_register.patch | 0 ...ppropriate-atomic-state-in-virtio_gp.patch | 0 ...ntial-deadlocks-for-fown_struct.lock.patch | 0 ...etown-ex-return-0-on-dead-owner-task.patch | 0 ...o-not-set-btn_mouse-on-double-report.patch | 0 ...and-vf-association-message-from-host.patch | 0 ...-coretemp-handle-large-core-id-value.patch | 0 ...of-pm_runtime_xx-and-i2c_add_adapter.patch | 0 .../i40e-fix-dma-mappings-leak.patch | 0 ...-nvs-regions-in-arch_rmrr_sanity_che.patch | 0 ...-up-si_domain-in-the-init_dmars-erro.patch | 0 ...catch-null-pointer-issue-on-reconfig.patch | 0 ...dd-support-for-arch-compat-vm-ioctls.patch | 0 ...fix-exit-condition-in-scan_its_table.patch | 0 ...ug-re-enable-debug-info-for-.s-files.patch | 0 ...timeout-to-at-least-timeout-provided.patch | 0 ...dle-the-case-where-find_format-fails.patch | 0 ...smaps_rollup-fix-no-vma-s-null-deref.patch | 0 ...add-sd-card-quirk-for-broken-discard.patch | 0 ...use-actual-clock-rate-for-sw-tuning-.patch | 0 ...roc_mpc_write-incorrect-return-value.patch | 0 ...ible-memory-leak-in-hnae_ae_register.patch | 0 ...oid-possible-null-deref-in-skb_clone.patch | 0 ...disable-mdi-crossover-status-change-.patch | 0 ...extend-rx-strap-quirk-for-sgmii-mode.patch | 0 ...ix-null-pointer-access-issue-when-ca.patch | 0 ...-duplicate-cleanup-of-backlog-and-ql.patch | 0 ...ed-fix-race-condition-in-qdisc_graft.patch | 0 ...x-null-pointer-access-issue-when-sfb.patch | 0 ...stently-ignore-errors-from-nvme_hwmo.patch | 0 ...on-kmalloc-the-nvme-smart-log-buffer.patch | 0 ...n-error-code-when-registration-fails.patch | 0 ...wmon-rework-to-avoid-devm-allocation.patch | 0 ...-dinode-links-count-in-case-of-error.patch | 0 ...ug-when-iput-after-ocfs2_mknod-fails.patch | 0 ...e-raw-event-with-sysfs-exported-form.patch | 0 ...warn-on-unknown-format-confign-attrs.patch | 0 ...l-pt-relax-address-filter-validation.patch | 0 ...-add-pid-for-the-lenovo-onelink-dock.patch | 0 ...e-name-to-kernel-boot-log-and-stack-.patch | 0 ...or-the-config_cmdline_force-when-par.patch | 0 ...ology-fix-default-topology-reporting.patch | 0 ...el-and-gfp_atomic-in-convert_context.patch | 0 {temp-5.10 => queue-5.10}/series | 5 - ...c-via-pf-as-first-preference-if-avai.patch | 0 ...ort_id-in-filter-spec-hash-and-equal.patch | 0 ...losed_socks-to-struct-sock_reuseport.patch | 0 ...rmation-leak-in-tipc_topsrv_kern_sub.patch | 0 ...tipc-fix-recognition-of-trial-period.patch | 0 ...ree-snapshot-if-tracer-is-on-cmdline.patch | 0 ...-conditional-compilation-code-in-tra.patch | 0 ...reuse-has_conns-under-reuseport_lock.patch | 0 ...heck-for-mabi-ms-for-config_efi_stub.patch | 0 ...-patch-early-on-every-logical-thread.patch | 0 ...at_gnttab_map_avail_bits-being-set-f.patch | 0 ...xen-gntdev-accommodate-vma-splitting.patch | 0 ...-btf_kind_float-when-linking-vmlinux.patch | 52 --------- ...encoding_btf_enum64-option-to-pahole.patch | 45 -------- ...-avoid-a-pahole-call-break-the-build.patch | 69 ------------ ...tf-generation-for-pahole-v1.18-v1.21.patch | 56 ---------- ...f-generation-for-vmlinux-and-modules.patch | 100 ------------------ 79 files changed, 327 deletions(-) rename {temp-5.10 => queue-5.10}/acpi-extlog-handle-multiple-records.patch (100%) rename {temp-5.10 => queue-5.10}/acpi-video-force-backlight-native-for-more-tongfang-devices.patch (100%) rename {temp-5.10 => queue-5.10}/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch (100%) rename {temp-5.10 => queue-5.10}/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch (100%) rename {temp-5.10 => queue-5.10}/arm64-topology-move-store_cpu_topology-to-shared-code.patch (100%) rename {temp-5.10 => queue-5.10}/ata-ahci-imx-fix-module_alias.patch (100%) rename {temp-5.10 => queue-5.10}/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch (100%) rename {temp-5.10 => queue-5.10}/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch (100%) rename {temp-5.10 => queue-5.10}/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch (100%) rename {temp-5.10 => queue-5.10}/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch (100%) rename {temp-5.10 => queue-5.10}/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch (100%) rename {temp-5.10 => queue-5.10}/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch (100%) rename {temp-5.10 => queue-5.10}/cifs-fix-xid-leak-in-cifs_copy_file_range.patch (100%) rename {temp-5.10 => queue-5.10}/cifs-fix-xid-leak-in-cifs_flock.patch (100%) rename {temp-5.10 => queue-5.10}/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch (100%) rename {temp-5.10 => queue-5.10}/cpufreq-qcom-fix-memory-leak-in-error-path.patch (100%) rename {temp-5.10 => queue-5.10}/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch (100%) rename {temp-5.10 => queue-5.10}/dmaengine-mxs-dma-remove-the-unused-.id_table.patch (100%) rename {temp-5.10 => queue-5.10}/dmaengine-mxs-use-platform_driver_register.patch (100%) rename {temp-5.10 => queue-5.10}/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch (100%) rename {temp-5.10 => queue-5.10}/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch (100%) rename {temp-5.10 => queue-5.10}/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch (100%) rename {temp-5.10 => queue-5.10}/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch (100%) rename {temp-5.10 => queue-5.10}/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch (100%) rename {temp-5.10 => queue-5.10}/hwmon-coretemp-handle-large-core-id-value.patch (100%) rename {temp-5.10 => queue-5.10}/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch (100%) rename {temp-5.10 => queue-5.10}/i40e-fix-dma-mappings-leak.patch (100%) rename {temp-5.10 => queue-5.10}/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch (100%) rename {temp-5.10 => queue-5.10}/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch (100%) rename {temp-5.10 => queue-5.10}/ionic-catch-null-pointer-issue-on-reconfig.patch (100%) rename {temp-5.10 => queue-5.10}/kvm-add-support-for-arch-compat-vm-ioctls.patch (100%) rename {temp-5.10 => queue-5.10}/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch (100%) rename {temp-5.10 => queue-5.10}/makefile.debug-re-enable-debug-info-for-.s-files.patch (100%) rename {temp-5.10 => queue-5.10}/media-mceusb-set-timeout-to-at-least-timeout-provided.patch (100%) rename {temp-5.10 => queue-5.10}/media-venus-dec-handle-the-case-where-find_format-fails.patch (100%) rename {temp-5.10 => queue-5.10}/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch (100%) rename {temp-5.10 => queue-5.10}/mmc-core-add-sd-card-quirk-for-broken-discard.patch (100%) rename {temp-5.10 => queue-5.10}/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch (100%) rename {temp-5.10 => queue-5.10}/net-atm-fix-proc_mpc_write-incorrect-return-value.patch (100%) rename {temp-5.10 => queue-5.10}/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch (100%) rename {temp-5.10 => queue-5.10}/net-hsr-avoid-possible-null-deref-in-skb_clone.patch (100%) rename {temp-5.10 => queue-5.10}/net-phy-dp83822-disable-mdi-crossover-status-change-.patch (100%) rename {temp-5.10 => queue-5.10}/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch (100%) rename {temp-5.10 => queue-5.10}/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch (100%) rename {temp-5.10 => queue-5.10}/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch (100%) rename {temp-5.10 => queue-5.10}/net-sched-fix-race-condition-in-qdisc_graft.patch (100%) rename {temp-5.10 => queue-5.10}/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch (100%) rename {temp-5.10 => queue-5.10}/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch (100%) rename {temp-5.10 => queue-5.10}/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch (100%) rename {temp-5.10 => queue-5.10}/nvme-hwmon-return-error-code-when-registration-fails.patch (100%) rename {temp-5.10 => queue-5.10}/nvme-hwmon-rework-to-avoid-devm-allocation.patch (100%) rename {temp-5.10 => queue-5.10}/ocfs2-clear-dinode-links-count-in-case-of-error.patch (100%) rename {temp-5.10 => queue-5.10}/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch (100%) rename {temp-5.10 => queue-5.10}/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch (100%) rename {temp-5.10 => queue-5.10}/perf-skip-and-warn-on-unknown-format-confign-attrs.patch (100%) rename {temp-5.10 => queue-5.10}/perf-x86-intel-pt-relax-address-filter-validation.patch (100%) rename {temp-5.10 => queue-5.10}/r8152-add-pid-for-the-lenovo-onelink-dock.patch (100%) rename {temp-5.10 => queue-5.10}/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch (100%) rename {temp-5.10 => queue-5.10}/riscv-always-honor-the-config_cmdline_force-when-par.patch (100%) rename {temp-5.10 => queue-5.10}/riscv-topology-fix-default-topology-reporting.patch (100%) rename {temp-5.10 => queue-5.10}/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch (100%) rename {temp-5.10 => queue-5.10}/series (92%) rename {temp-5.10 => queue-5.10}/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch (100%) rename {temp-5.10 => queue-5.10}/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch (100%) rename {temp-5.10 => queue-5.10}/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch (100%) rename {temp-5.10 => queue-5.10}/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch (100%) rename {temp-5.10 => queue-5.10}/tipc-fix-recognition-of-trial-period.patch (100%) rename {temp-5.10 => queue-5.10}/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch (100%) rename {temp-5.10 => queue-5.10}/tracing-simplify-conditional-compilation-code-in-tra.patch (100%) rename {temp-5.10 => queue-5.10}/udp-update-reuse-has_conns-under-reuseport_lock.patch (100%) rename {temp-5.10 => queue-5.10}/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch (100%) rename {temp-5.10 => queue-5.10}/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch (100%) rename {temp-5.10 => queue-5.10}/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch (100%) rename {temp-5.10 => queue-5.10}/xen-gntdev-accommodate-vma-splitting.patch (100%) delete mode 100644 temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch delete mode 100644 temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch delete mode 100644 temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch delete mode 100644 temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch delete mode 100644 temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch diff --git a/temp-5.10/acpi-extlog-handle-multiple-records.patch b/queue-5.10/acpi-extlog-handle-multiple-records.patch similarity index 100% rename from temp-5.10/acpi-extlog-handle-multiple-records.patch rename to queue-5.10/acpi-extlog-handle-multiple-records.patch diff --git a/temp-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch b/queue-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch similarity index 100% rename from temp-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch rename to queue-5.10/acpi-video-force-backlight-native-for-more-tongfang-devices.patch diff --git a/temp-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch b/queue-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch similarity index 100% rename from temp-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch rename to queue-5.10/arm64-dts-qcom-sc7180-trogdor-fixup-modem-memory-region.patch diff --git a/temp-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch b/queue-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch similarity index 100% rename from temp-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch rename to queue-5.10/arm64-errata-remove-aes-hwcap-for-compat-tasks.patch diff --git a/temp-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch b/queue-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch similarity index 100% rename from temp-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch rename to queue-5.10/arm64-topology-move-store_cpu_topology-to-shared-code.patch diff --git a/temp-5.10/ata-ahci-imx-fix-module_alias.patch b/queue-5.10/ata-ahci-imx-fix-module_alias.patch similarity index 100% rename from temp-5.10/ata-ahci-imx-fix-module_alias.patch rename to queue-5.10/ata-ahci-imx-fix-module_alias.patch diff --git a/temp-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch b/queue-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch similarity index 100% rename from temp-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch rename to queue-5.10/ata-ahci-match-em_max_slots-with-sata_pmp_max_ports.patch diff --git a/temp-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch b/queue-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch similarity index 100% rename from temp-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch rename to queue-5.10/blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch diff --git a/temp-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch b/queue-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch similarity index 100% rename from temp-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch rename to queue-5.10/blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch diff --git a/temp-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch b/queue-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch similarity index 100% rename from temp-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch rename to queue-5.10/block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch diff --git a/temp-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch b/queue-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch similarity index 100% rename from temp-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch rename to queue-5.10/btrfs-fix-processing-of-delayed-data-refs-during-bac.patch diff --git a/temp-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch b/queue-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch similarity index 100% rename from temp-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch rename to queue-5.10/btrfs-fix-processing-of-delayed-tree-block-refs-duri.patch diff --git a/temp-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch b/queue-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch similarity index 100% rename from temp-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch rename to queue-5.10/cifs-fix-xid-leak-in-cifs_copy_file_range.patch diff --git a/temp-5.10/cifs-fix-xid-leak-in-cifs_flock.patch b/queue-5.10/cifs-fix-xid-leak-in-cifs_flock.patch similarity index 100% rename from temp-5.10/cifs-fix-xid-leak-in-cifs_flock.patch rename to queue-5.10/cifs-fix-xid-leak-in-cifs_flock.patch diff --git a/temp-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch b/queue-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch similarity index 100% rename from temp-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch rename to queue-5.10/cifs-fix-xid-leak-in-cifs_ses_add_channel.patch diff --git a/temp-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch b/queue-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch similarity index 100% rename from temp-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch rename to queue-5.10/cpufreq-qcom-fix-memory-leak-in-error-path.patch diff --git a/temp-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch b/queue-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch similarity index 100% rename from temp-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch rename to queue-5.10/cpufreq-qcom-fix-writes-in-read-only-memory-region.patch diff --git a/temp-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch b/queue-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch similarity index 100% rename from temp-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch rename to queue-5.10/dmaengine-mxs-dma-remove-the-unused-.id_table.patch diff --git a/temp-5.10/dmaengine-mxs-use-platform_driver_register.patch b/queue-5.10/dmaengine-mxs-use-platform_driver_register.patch similarity index 100% rename from temp-5.10/dmaengine-mxs-use-platform_driver_register.patch rename to queue-5.10/dmaengine-mxs-use-platform_driver_register.patch diff --git a/temp-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch b/queue-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch similarity index 100% rename from temp-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch rename to queue-5.10/drm-virtio-use-appropriate-atomic-state-in-virtio_gp.patch diff --git a/temp-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch b/queue-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch similarity index 100% rename from temp-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch rename to queue-5.10/fcntl-fix-potential-deadlocks-for-fown_struct.lock.patch diff --git a/temp-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch b/queue-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch similarity index 100% rename from temp-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch rename to queue-5.10/fcntl-make-f_getown-ex-return-0-on-dead-owner-task.patch diff --git a/temp-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch b/queue-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch similarity index 100% rename from temp-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch rename to queue-5.10/hid-magicmouse-do-not-set-btn_mouse-on-double-report.patch diff --git a/temp-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch b/queue-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch similarity index 100% rename from temp-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch rename to queue-5.10/hv_netvsc-fix-race-between-vf-offering-and-vf-association-message-from-host.patch diff --git a/temp-5.10/hwmon-coretemp-handle-large-core-id-value.patch b/queue-5.10/hwmon-coretemp-handle-large-core-id-value.patch similarity index 100% rename from temp-5.10/hwmon-coretemp-handle-large-core-id-value.patch rename to queue-5.10/hwmon-coretemp-handle-large-core-id-value.patch diff --git a/temp-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch b/queue-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch similarity index 100% rename from temp-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch rename to queue-5.10/i2c-qcom-cci-fix-ordering-of-pm_runtime_xx-and-i2c_add_adapter.patch diff --git a/temp-5.10/i40e-fix-dma-mappings-leak.patch b/queue-5.10/i40e-fix-dma-mappings-leak.patch similarity index 100% rename from temp-5.10/i40e-fix-dma-mappings-leak.patch rename to queue-5.10/i40e-fix-dma-mappings-leak.patch diff --git a/temp-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch b/queue-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch similarity index 100% rename from temp-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch rename to queue-5.10/iommu-vt-d-allow-nvs-regions-in-arch_rmrr_sanity_che.patch diff --git a/temp-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch b/queue-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch similarity index 100% rename from temp-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch rename to queue-5.10/iommu-vt-d-clean-up-si_domain-in-the-init_dmars-erro.patch diff --git a/temp-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch b/queue-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch similarity index 100% rename from temp-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch rename to queue-5.10/ionic-catch-null-pointer-issue-on-reconfig.patch diff --git a/temp-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch b/queue-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch similarity index 100% rename from temp-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch rename to queue-5.10/kvm-add-support-for-arch-compat-vm-ioctls.patch diff --git a/temp-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch b/queue-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch similarity index 100% rename from temp-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch rename to queue-5.10/kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch diff --git a/temp-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch b/queue-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch similarity index 100% rename from temp-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch rename to queue-5.10/makefile.debug-re-enable-debug-info-for-.s-files.patch diff --git a/temp-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch b/queue-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch similarity index 100% rename from temp-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch rename to queue-5.10/media-mceusb-set-timeout-to-at-least-timeout-provided.patch diff --git a/temp-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch b/queue-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch similarity index 100% rename from temp-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch rename to queue-5.10/media-venus-dec-handle-the-case-where-find_format-fails.patch diff --git a/temp-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch b/queue-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch similarity index 100% rename from temp-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch rename to queue-5.10/mm-proc-pid-smaps_rollup-fix-no-vma-s-null-deref.patch diff --git a/temp-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch b/queue-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch similarity index 100% rename from temp-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch rename to queue-5.10/mmc-core-add-sd-card-quirk-for-broken-discard.patch diff --git a/temp-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch b/queue-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch similarity index 100% rename from temp-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch rename to queue-5.10/mmc-sdhci-tegra-use-actual-clock-rate-for-sw-tuning-.patch diff --git a/temp-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch b/queue-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch similarity index 100% rename from temp-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch rename to queue-5.10/net-atm-fix-proc_mpc_write-incorrect-return-value.patch diff --git a/temp-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch b/queue-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch similarity index 100% rename from temp-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch rename to queue-5.10/net-hns-fix-possible-memory-leak-in-hnae_ae_register.patch diff --git a/temp-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch b/queue-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch similarity index 100% rename from temp-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch rename to queue-5.10/net-hsr-avoid-possible-null-deref-in-skb_clone.patch diff --git a/temp-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch b/queue-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch similarity index 100% rename from temp-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch rename to queue-5.10/net-phy-dp83822-disable-mdi-crossover-status-change-.patch diff --git a/temp-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch b/queue-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch similarity index 100% rename from temp-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch rename to queue-5.10/net-phy-dp83867-extend-rx-strap-quirk-for-sgmii-mode.patch diff --git a/temp-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch b/queue-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch similarity index 100% rename from temp-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch rename to queue-5.10/net-sched-cake-fix-null-pointer-access-issue-when-ca.patch diff --git a/temp-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch b/queue-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch similarity index 100% rename from temp-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch rename to queue-5.10/net-sched-delete-duplicate-cleanup-of-backlog-and-ql.patch diff --git a/temp-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch b/queue-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch similarity index 100% rename from temp-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch rename to queue-5.10/net-sched-fix-race-condition-in-qdisc_graft.patch diff --git a/temp-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch b/queue-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch similarity index 100% rename from temp-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch rename to queue-5.10/net-sched-sfb-fix-null-pointer-access-issue-when-sfb.patch diff --git a/temp-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch b/queue-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch similarity index 100% rename from temp-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch rename to queue-5.10/nvme-hwmon-consistently-ignore-errors-from-nvme_hwmo.patch diff --git a/temp-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch b/queue-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch similarity index 100% rename from temp-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch rename to queue-5.10/nvme-hwmon-kmalloc-the-nvme-smart-log-buffer.patch diff --git a/temp-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch b/queue-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch similarity index 100% rename from temp-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch rename to queue-5.10/nvme-hwmon-return-error-code-when-registration-fails.patch diff --git a/temp-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch b/queue-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch similarity index 100% rename from temp-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch rename to queue-5.10/nvme-hwmon-rework-to-avoid-devm-allocation.patch diff --git a/temp-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch b/queue-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch similarity index 100% rename from temp-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch rename to queue-5.10/ocfs2-clear-dinode-links-count-in-case-of-error.patch diff --git a/temp-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch b/queue-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch similarity index 100% rename from temp-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch rename to queue-5.10/ocfs2-fix-bug-when-iput-after-ocfs2_mknod-fails.patch diff --git a/temp-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch b/queue-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch similarity index 100% rename from temp-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch rename to queue-5.10/perf-pmu-validate-raw-event-with-sysfs-exported-form.patch diff --git a/temp-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch b/queue-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch similarity index 100% rename from temp-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch rename to queue-5.10/perf-skip-and-warn-on-unknown-format-confign-attrs.patch diff --git a/temp-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch b/queue-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch similarity index 100% rename from temp-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch rename to queue-5.10/perf-x86-intel-pt-relax-address-filter-validation.patch diff --git a/temp-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch b/queue-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch similarity index 100% rename from temp-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch rename to queue-5.10/r8152-add-pid-for-the-lenovo-onelink-dock.patch diff --git a/temp-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch b/queue-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch similarity index 100% rename from temp-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch rename to queue-5.10/riscv-add-machine-name-to-kernel-boot-log-and-stack-.patch diff --git a/temp-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch b/queue-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch similarity index 100% rename from temp-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch rename to queue-5.10/riscv-always-honor-the-config_cmdline_force-when-par.patch diff --git a/temp-5.10/riscv-topology-fix-default-topology-reporting.patch b/queue-5.10/riscv-topology-fix-default-topology-reporting.patch similarity index 100% rename from temp-5.10/riscv-topology-fix-default-topology-reporting.patch rename to queue-5.10/riscv-topology-fix-default-topology-reporting.patch diff --git a/temp-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch b/queue-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch similarity index 100% rename from temp-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch rename to queue-5.10/selinux-enable-use-of-both-gfp_kernel-and-gfp_atomic-in-convert_context.patch diff --git a/temp-5.10/series b/queue-5.10/series similarity index 92% rename from temp-5.10/series rename to queue-5.10/series index c1724ca9303..a43e694e9e3 100644 --- a/temp-5.10/series +++ b/queue-5.10/series @@ -12,11 +12,6 @@ kvm-add-support-for-arch-compat-vm-ioctls.patch kvm-arm64-vgic-fix-exit-condition-in-scan_its_table.patch media-mceusb-set-timeout-to-at-least-timeout-provided.patch media-venus-dec-handle-the-case-where-find_format-fails.patch -bpf-generate-btf_kind_float-when-linking-vmlinux.patch -kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch -kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch -kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch -kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch block-wbt-remove-unnecessary-invoking-of-wbt_update_limits-in-wbt_init.patch blk-wbt-call-rq_qos_add-after-wb_normal-is-initialized.patch arm64-errata-remove-aes-hwcap-for-compat-tasks.patch diff --git a/temp-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch b/queue-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch similarity index 100% rename from temp-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch rename to queue-5.10/sfc-change-vf-mac-via-pf-as-first-preference-if-avai.patch diff --git a/temp-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch b/queue-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch similarity index 100% rename from temp-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch rename to queue-5.10/sfc-include-vport_id-in-filter-spec-hash-and-equal.patch diff --git a/temp-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch b/queue-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch similarity index 100% rename from temp-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch rename to queue-5.10/tcp-add-num_closed_socks-to-struct-sock_reuseport.patch diff --git a/temp-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch b/queue-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch similarity index 100% rename from temp-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch rename to queue-5.10/tipc-fix-an-information-leak-in-tipc_topsrv_kern_sub.patch diff --git a/temp-5.10/tipc-fix-recognition-of-trial-period.patch b/queue-5.10/tipc-fix-recognition-of-trial-period.patch similarity index 100% rename from temp-5.10/tipc-fix-recognition-of-trial-period.patch rename to queue-5.10/tipc-fix-recognition-of-trial-period.patch diff --git a/temp-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch b/queue-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch similarity index 100% rename from temp-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch rename to queue-5.10/tracing-do-not-free-snapshot-if-tracer-is-on-cmdline.patch diff --git a/temp-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch b/queue-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch similarity index 100% rename from temp-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch rename to queue-5.10/tracing-simplify-conditional-compilation-code-in-tra.patch diff --git a/temp-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch b/queue-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch similarity index 100% rename from temp-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch rename to queue-5.10/udp-update-reuse-has_conns-under-reuseport_lock.patch diff --git a/temp-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch b/queue-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch similarity index 100% rename from temp-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch rename to queue-5.10/x86-kconfig-drop-check-for-mabi-ms-for-config_efi_stub.patch diff --git a/temp-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch b/queue-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch similarity index 100% rename from temp-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch rename to queue-5.10/x86-microcode-amd-apply-the-patch-early-on-every-logical-thread.patch diff --git a/temp-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch b/queue-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch similarity index 100% rename from temp-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch rename to queue-5.10/xen-assume-xenfeat_gnttab_map_avail_bits-being-set-f.patch diff --git a/temp-5.10/xen-gntdev-accommodate-vma-splitting.patch b/queue-5.10/xen-gntdev-accommodate-vma-splitting.patch similarity index 100% rename from temp-5.10/xen-gntdev-accommodate-vma-splitting.patch rename to queue-5.10/xen-gntdev-accommodate-vma-splitting.patch diff --git a/temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch b/temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch deleted file mode 100644 index ff15941e5d1..00000000000 --- a/temp-5.10/bpf-generate-btf_kind_float-when-linking-vmlinux.patch +++ /dev/null @@ -1,52 +0,0 @@ -From foo@baz Wed Oct 26 06:44:13 PM CEST 2022 -From: Jiri Olsa -Date: Wed, 19 Oct 2022 10:56:00 +0200 -Subject: bpf: Generate BTF_KIND_FLOAT when linking vmlinux -To: stable@vger.kernel.org -Cc: "Andrii Nakryiko" , bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" , "Daniel Borkmann" , "Martin Rodriguez Reboredo" , "Javier Martinez Canillas" , "Ilya Leoshkevich" , "Nathan Chancellor" , "Philip Müller" -Message-ID: <20221019085604.1017583-2-jolsa@kernel.org> - -From: Ilya Leoshkevich - -commit db16c1fe92d7ba7d39061faef897842baee2c887 upstream. - -[backported for dependency only extra_paholeopt variable setup and -usage, we don't want floats generated in 5.10] - -pahole v1.21 supports the --btf_gen_floats flag, which makes it -generate the information about the floating-point types [1]. - -Adjust link-vmlinux.sh to pass this flag to pahole in case it's -supported, which is determined using a simple version check. - -[1] https://lore.kernel.org/dwarves/YHRiXNX1JUF2Az0A@kernel.org/ - -Signed-off-by: Ilya Leoshkevich -Signed-off-by: Andrii Nakryiko -Acked-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20210413190043.21918-1-iii@linux.ibm.com -Signed-off-by: Jiri Olsa -Signed-off-by: Greg Kroah-Hartman ---- - scripts/link-vmlinux.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/scripts/link-vmlinux.sh -+++ b/scripts/link-vmlinux.sh -@@ -146,6 +146,7 @@ vmlinux_link() - gen_btf() - { - local pahole_ver -+ local extra_paholeopt= - - if ! [ -x "$(command -v ${PAHOLE})" ]; then - echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available" -@@ -161,7 +162,7 @@ gen_btf() - vmlinux_link ${1} - - info "BTF" ${2} -- LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1} -+ LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1} - - # Create ${2} which contains just .BTF section but no symbols. Add - # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all diff --git a/temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch b/temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch deleted file mode 100644 index ffaa5bd6ebb..00000000000 --- a/temp-5.10/kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch +++ /dev/null @@ -1,45 +0,0 @@ -From foo@baz Wed Oct 26 06:44:13 PM CEST 2022 -From: Jiri Olsa -Date: Wed, 19 Oct 2022 10:56:04 +0200 -Subject: kbuild: Add skip_encoding_btf_enum64 option to pahole -To: stable@vger.kernel.org -Cc: bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" , "Daniel Borkmann" , "Martin Rodriguez Reboredo" , "Andrii Nakryiko" , "Javier Martinez Canillas" , "Ilya Leoshkevich" , "Nathan Chancellor" , "Philip Müller" -Message-ID: <20221019085604.1017583-6-jolsa@kernel.org> - -From: Martin Rodriguez Reboredo - -New pahole (version 1.24) generates by default new BTF_KIND_ENUM64 BTF tag, -which is not supported by stable kernel. - -As a result the kernel with CONFIG_DEBUG_INFO_BTF option will fail to -compile with following error: - - BTFIDS vmlinux -FAILED: load BTF from vmlinux: Invalid argument - -New pahole provides --skip_encoding_btf_enum64 option to skip BTF_KIND_ENUM64 -generation and produce BTF supported by stable kernel. - -Adding this option to scripts/pahole-flags.sh. - -This change does not have equivalent commit in linus tree, because linus tree -has support for BTF_KIND_ENUM64 tag, so it does not need to be disabled. - -Signed-off-by: Martin Rodriguez Reboredo -Signed-off-by: Jiri Olsa -Signed-off-by: Greg Kroah-Hartman ---- - scripts/pahole-flags.sh | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/scripts/pahole-flags.sh -+++ b/scripts/pahole-flags.sh -@@ -14,4 +14,8 @@ if [ "${pahole_ver}" -ge "118" ] && [ "$ - extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" - fi - -+if [ "${pahole_ver}" -ge "124" ]; then -+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64" -+fi -+ - echo ${extra_paholeopt} diff --git a/temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch b/temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch deleted file mode 100644 index cf48c7280f8..00000000000 --- a/temp-5.10/kbuild-quote-objcopy-var-to-avoid-a-pahole-call-break-the-build.patch +++ /dev/null @@ -1,69 +0,0 @@ -From foo@baz Wed Oct 26 06:44:13 PM CEST 2022 -From: Jiri Olsa -Date: Wed, 19 Oct 2022 10:56:01 +0200 -Subject: kbuild: Quote OBJCOPY var to avoid a pahole call break the build -To: stable@vger.kernel.org -Cc: "Andrii Nakryiko" , "Arnaldo Carvalho de Melo" , bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" , "Daniel Borkmann" , "Martin Rodriguez Reboredo" , "Javier Martinez Canillas" , "Ilya Leoshkevich" , "Nathan Chancellor" , "Philip Müller" -Message-ID: <20221019085604.1017583-3-jolsa@kernel.org> - -From: Javier Martinez Canillas - -commit ff2e6efda0d5c51b33e2bcc0b0b981ac0a0ef214 upstream. - -[backported for dependency, skipped Makefile.modfinal change, -because module BTF is not supported in 5.10] - -The ccache tool can be used to speed up cross-compilation, by calling the -compiler and binutils through ccache. For example, following should work: - - $ export ARCH=arm64 CROSS_COMPILE="ccache aarch64-linux-gnu-" - - $ make M=drivers/gpu/drm/rockchip/ - -but pahole fails to extract the BTF info from DWARF, breaking the build: - - CC [M] drivers/gpu/drm/rockchip//rockchipdrm.mod.o - LD [M] drivers/gpu/drm/rockchip//rockchipdrm.ko - BTF [M] drivers/gpu/drm/rockchip//rockchipdrm.ko - aarch64-linux-gnu-objcopy: invalid option -- 'J' - Usage: aarch64-linux-gnu-objcopy [option(s)] in-file [out-file] - Copies a binary file, possibly transforming it in the process - ... - make[1]: *** [scripts/Makefile.modpost:156: __modpost] Error 2 - make: *** [Makefile:1866: modules] Error 2 - -this fails because OBJCOPY is set to "ccache aarch64-linux-gnu-copy" and -later pahole is executed with the following command line: - - LLVM_OBJCOPY=$(OBJCOPY) $(PAHOLE) -J --btf_base vmlinux $@ - -which gets expanded to: - - LLVM_OBJCOPY=ccache aarch64-linux-gnu-objcopy pahole -J ... - -instead of: - - LLVM_OBJCOPY="ccache aarch64-linux-gnu-objcopy" pahole -J ... - -Fixes: 5f9ae91f7c0d ("kbuild: Build kernel module BTFs if BTF is enabled and pahole supports it") -Signed-off-by: Javier Martinez Canillas -Signed-off-by: Andrii Nakryiko -Acked-by: Andrii Nakryiko -Acked-by: Arnaldo Carvalho de Melo -Link: https://lore.kernel.org/bpf/20210526215228.3729875-1-javierm@redhat.com -Signed-off-by: Greg Kroah-Hartman ---- - scripts/link-vmlinux.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/scripts/link-vmlinux.sh -+++ b/scripts/link-vmlinux.sh -@@ -162,7 +162,7 @@ gen_btf() - vmlinux_link ${1} - - info "BTF" ${2} -- LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${extra_paholeopt} ${1} -+ LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1} - - # Create ${2} which contains just .BTF section but no symbols. Add - # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all diff --git a/temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch b/temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch deleted file mode 100644 index f1da8b0a275..00000000000 --- a/temp-5.10/kbuild-skip-per-cpu-btf-generation-for-pahole-v1.18-v1.21.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Wed Oct 26 06:44:13 PM CEST 2022 -From: Jiri Olsa -Date: Wed, 19 Oct 2022 10:56:02 +0200 -Subject: kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21 -To: stable@vger.kernel.org -Cc: "Mel Gorman" , "Arnaldo Carvalho de Melo" , "Hao Luo" , "Michal Suchanek" , bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" , "Daniel Borkmann" , "Martin Rodriguez Reboredo" , "Andrii Nakryiko" , "Javier Martinez Canillas" , "Ilya Leoshkevich" , "Nathan Chancellor" , "Philip Müller" -Message-ID: <20221019085604.1017583-4-jolsa@kernel.org> - -From: Andrii Nakryiko - -commit a0b8200d06ad6450c179407baa5f0f52f8cfcc97 upstream. - -[small context changes due to missing floats support in 5.10] - -Commit "mm/page_alloc: convert per-cpu list protection to local_lock" will -introduce a zero-sized per-CPU variable, which causes pahole to generate -invalid BTF. Only pahole versions 1.18 through 1.21 are impacted, as -before 1.18 pahole doesn't know anything about per-CPU variables, and 1.22 -contains the proper fix for the issue. - -Luckily, pahole 1.18 got --skip_encoding_btf_vars option disabling BTF -generation for per-CPU variables in anticipation of some unanticipated -problems. So use this escape hatch to disable per-CPU var BTF info on -those problematic pahole versions. Users relying on availability of -per-CPU var BTFs would need to upgrade to pahole 1.22+, but everyone won't -notice any regressions. - -Link: https://lkml.kernel.org/r/20210530002536.3193829-1-andrii@kernel.org -Signed-off-by: Andrii Nakryiko -Acked-by: Mel Gorman -Cc: Arnaldo Carvalho de Melo -Cc: Hao Luo -Cc: Michal Suchanek -Cc: Jiri Olsa -Signed-off-by: Andrew Morton -Signed-off-by: Linus Torvalds -Signed-off-by: Jiri Olsa -Signed-off-by: Greg Kroah-Hartman ---- - scripts/link-vmlinux.sh | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/scripts/link-vmlinux.sh -+++ b/scripts/link-vmlinux.sh -@@ -161,6 +161,11 @@ gen_btf() - - vmlinux_link ${1} - -+ if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then -+ # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars -+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" -+ fi -+ - info "BTF" ${2} - LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1} - diff --git a/temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch b/temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch deleted file mode 100644 index 130e5b5c291..00000000000 --- a/temp-5.10/kbuild-unify-options-for-btf-generation-for-vmlinux-and-modules.patch +++ /dev/null @@ -1,100 +0,0 @@ -From foo@baz Wed Oct 26 06:44:13 PM CEST 2022 -From: Jiri Olsa -Date: Wed, 19 Oct 2022 10:56:03 +0200 -Subject: kbuild: Unify options for BTF generation for vmlinux and modules -To: stable@vger.kernel.org -Cc: "Andrii Nakryiko" , bpf@vger.kernel.org, "Arnaldo Carvalho de Melo" , "Daniel Borkmann" , "Martin Rodriguez Reboredo" , "Javier Martinez Canillas" , "Ilya Leoshkevich" , "Nathan Chancellor" , "Philip Müller" -Message-ID: <20221019085604.1017583-5-jolsa@kernel.org> - -From: Jiri Olsa - -commit 9741e07ece7c247dd65e1aa01e16b683f01c05a8 upstream. - -[skipped --btf_gen_floats option in pahole-flags.sh, skipped -Makefile.modfinal change, because there's no BTF kmod support, -squashing in 'exit 0' change from merge commit fc02cb2b37fe] - -Using new PAHOLE_FLAGS variable to pass extra arguments to -pahole for both vmlinux and modules BTF data generation. - -Adding new scripts/pahole-flags.sh script that detect and -prints pahole options. - -[ fixed issues found by kernel test robot ] - -Signed-off-by: Jiri Olsa -Signed-off-by: Andrii Nakryiko -Acked-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20211029125729.70002-1-jolsa@kernel.org -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 3 +++ - scripts/link-vmlinux.sh | 8 +------- - scripts/pahole-flags.sh | 17 +++++++++++++++++ - 3 files changed, 21 insertions(+), 7 deletions(-) - create mode 100755 scripts/pahole-flags.sh - ---- a/Makefile -+++ b/Makefile -@@ -465,6 +465,8 @@ LZ4 = lz4c - XZ = xz - ZSTD = zstd - -+PAHOLE_FLAGS = $(shell PAHOLE=$(PAHOLE) $(srctree)/scripts/pahole-flags.sh) -+ - CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ - -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF) - NOSTDINC_FLAGS := -@@ -518,6 +520,7 @@ export KBUILD_CFLAGS CFLAGS_KERNEL CFLAG - export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE - export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE - export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL -+export PAHOLE_FLAGS - - # Files to ignore in find ... statements - ---- a/scripts/link-vmlinux.sh -+++ b/scripts/link-vmlinux.sh -@@ -146,7 +146,6 @@ vmlinux_link() - gen_btf() - { - local pahole_ver -- local extra_paholeopt= - - if ! [ -x "$(command -v ${PAHOLE})" ]; then - echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available" -@@ -161,13 +160,8 @@ gen_btf() - - vmlinux_link ${1} - -- if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then -- # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars -- extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" -- fi -- - info "BTF" ${2} -- LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${extra_paholeopt} ${1} -+ LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1} - - # Create ${2} which contains just .BTF section but no symbols. Add - # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all ---- /dev/null -+++ b/scripts/pahole-flags.sh -@@ -0,0 +1,17 @@ -+#!/bin/sh -+# SPDX-License-Identifier: GPL-2.0 -+ -+extra_paholeopt= -+ -+if ! [ -x "$(command -v ${PAHOLE})" ]; then -+ exit 0 -+fi -+ -+pahole_ver=$(${PAHOLE} --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/') -+ -+if [ "${pahole_ver}" -ge "118" ] && [ "${pahole_ver}" -le "121" ]; then -+ # pahole 1.18 through 1.21 can't handle zero-sized per-CPU vars -+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_vars" -+fi -+ -+echo ${extra_paholeopt} -- 2.47.3