Zhan Xusheng <[email protected]> writes: > Commit 9edd04c4189e ("docs: Raise minimum pahole version to 1.26 for > KF_IMPLICIT_ARGS kfuncs") raised the minimum required pahole version > from 1.22 to 1.26 in the requirements table and added a paragraph > explaining the failure mode for distributions still shipping pahole > v1.25 (e.g. Ubuntu 24.04 LTS). > > The next day, commit ece7e57afd51 ("docs: changes.rst and ver_linux: > sort the lists") came through a different tree (docs vs sched_ext) and > re-flowed the table alphabetically, but its base did not include > 9edd04c4189e. When the two commits met in mainline, the textual rewrite > of the table won and the version bump was lost. The added "Since Linux > 7.0..." paragraph also disappeared. > > The result is that changes.rst on master (v7.1-rc5) lists pahole 1.22 > again, even though sched_ext kfuncs annotated with KF_IMPLICIT_ARGS > genuinely require v1.26 to produce a correct vmlinux BTF. Users on > distributions with pahole v1.25 hit "func_proto incompatible with > vmlinux" when loading any sched_ext BPF program (scx_simple, > scx_qmap, ...) and have no documentation pointing them at the version > gap. > > Restore both changes from 9edd04c4189e. > > Fixes: ece7e57afd51 ("docs: changes.rst and ver_linux: sort the lists") > Signed-off-by: Zhan Xusheng <[email protected]> > --- > Documentation/process/changes.rst | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-)
Oops, that is not good. Thanks for catching that; fix applied. jon
