From fe28d4a05072bdd0f71e69e34bda6dfff748026e Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 31 Jul 2026 10:52:14 -0400 Subject: [PATCH] reorder s390 ptff export ahead of its consumer in 7.1 and 6.18 Reordered patches: - "s390/ptff: Export ptff_function_mask[]" Upstream: 9de445d8296a7f2b011ebb5834fdc94dcda5c778 Queues: 7.1, 6.18 Reason: this export is the prerequisite for "ptp: ptp_s390: Add missing facility check" (e78f1ac37afcb16cb6fef8a2c92591eab6558956), whose ptff_query() use needs ptff_function_mask[]. Both were queued, but the export landed after its consumer in the series (7.1: 744 vs 666, 6.18: 676 vs 544), so applying the series in order leaves an intermediate commit that fails to build on s390x. Moved the export to immediately before the consumer in both series files. No patch files were added or removed; both patches stay queued. Report: https://lore.kernel.org/stable/669b8e16-19a6-49bf-a1ef-a7bce5075a9a@kernel.org/ Signed-off-by: Sasha Levin --- queue-6.18/series | 2 +- queue-7.1/series | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/queue-6.18/series b/queue-6.18/series index 6887c0c290..3b9e1df7fc 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -541,6 +541,7 @@ net-gro-fix-double-aggregation-of-flush-marked-skbs.patch net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch net-pcs-xpcs-fix-sgmii-state-reading.patch proc-fix-broken-error-paths-for-namespace-links.patch +s390-ptff-export-ptff_function_mask.patch ptp-ptp_s390-add-missing-facility-check.patch ice-fix-ptp-call-trace-during-ptp-release.patch selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch @@ -673,4 +674,3 @@ net-mlx5e-fix-null-pointer-dereference-in-ioctl-module-eeprom-query.patch net-stmmac-fix-dwmac4-transmit-performance-regression.patch gpu-fix-uninitialized-buddy-for-built-in-drivers.patch kvm-svm-bump-asid_generation-on-cpu-online-to-avoid-asid-collision-after-hotplug.patch -s390-ptff-export-ptff_function_mask.patch diff --git a/queue-7.1/series b/queue-7.1/series index 2a87ae2852..e3e078e89a 100644 --- a/queue-7.1/series +++ b/queue-7.1/series @@ -663,6 +663,7 @@ net-hip04-fix-rx-buffer-leak-on-build_skb-failure.patch net-pcs-xpcs-fix-sgmii-state-reading.patch net-qrtr-ns-raise-node-count-limit-to-512.patch proc-fix-broken-error-paths-for-namespace-links.patch +s390-ptff-export-ptff_function_mask.patch ptp-ptp_s390-add-missing-facility-check.patch ice-fix-ptp-call-trace-during-ptp-release.patch selftests-ftrace-reset-triggers-at-top-level-before-instance-loop.patch @@ -741,6 +742,5 @@ sched_ext-preserve-rq-tracking-across-local-dsq-dispatch.patch selftests-drv-net-cope-with-slow-env-in-so_txtime.py-test.patch selftests-drv-net-so_txtime-relax-variance-bounds.patch kvm-svm-bump-asid_generation-on-cpu-online-to-avoid-asid-collision-after-hotplug.patch -s390-ptff-export-ptff_function_mask.patch cifs-fix-time_last_write-stamp-placement-in-setattr-truncate-paths.patch cifs-consolidate-time_last_write-stamp-into-_cifsfileinfo_put.patch -- 2.47.3