Waldemar Brodkorb 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
files 2d7666cde2 simplify add_rcconf %!s(int64=10) %!d(string=hai) anos
patches aa44e3ad5b fix musl compile %!s(int64=11) %!d(string=hai) anos
Makefile 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos