ne 29. 3. 2026 v 18:22 odesÃlatel Steven Rostedt <[email protected]> napsal: > > That should probably be fixed on top of v7.0-rcX so that it is not > broken in 7.0. > > -- Steve >
After merging the fix for 7.0 [1], there's now a context difference caused by commit ea06305ff9920 (tools/rtla: Remove unneeded nr_cpus arguments) on merging rtla-v7.1 onto the current master. The context difference merges cleanly via three-way merge: $ git merge rtla-v7.1 Auto-merging tools/tracing/rtla/src/timerlat_bpf.h Merge made by the 'ort' strategy. ... Do you prefer me to rebase this PR on top of 7.0-rc6 once it's tagged or to leave the pull request as is and perhaps add a note to your PR to Linus the merge difference is expected? [1] https://lore.kernel.org/all/177490453553.1933951.12021005257041359513.pr-tracker-...@kernel.org/ Tomas
