Conflicts in merge 2.9 to master

[hansu]

I think the combination of #3901 and #3900 is what causes a lot of merge conflicts when trying to merge 2.9 to master.
Probably you @grandixximo knows best how to resolve those.

[grandixximo]

Sorry, was not aware that 2.9 was supposed to merge cleanly into master, will check...

[hansu]

We use the ”merging upwards” git workflow.

Hidden somewhere in the docs:
https://linuxcnc.org/docs/html/code/contributing-to-linuxcnc.html#_use_of_git_in_the_linuxcnc_project