On Mon Dec 18 19:09:33 2017, tmark wrote: > The changes are fine except for the version number changing from > 4.4.0a1 to 4.4.0-dev. 4.4.0-dev preceded 4.4.0a1. => it is a side effect to have run util/regen-conf.sh on a branch based on master. So either master has to be fixed or I have to rebase rt42446fd on another branch. Or simply edit the diff and apply it directly to master... it seems the simplest, doesn't it?