mlibc patch step failing

[JalonSolov]

With git commit be9c8a5, I am seeing this error when I try to run make distro:

xbstrap: patch mlibc [3/68]
Applying: Vinix specific changes
Using index info to reconstruct a base tree...
M       abis/mlibc/signal.h
M       meson.build
M       options/ansi/include/mlibc/ansi-sysdeps.hpp
M       options/internal/include/mlibc/internal-sysdeps.hpp
M       options/linux/include/asm/ioctls.h
M       options/posix/generic/unistd-stubs.cpp
.git/rebase-apply/patch:78: space before tab in indent.
        void (*sa_handler)(int);
.git/rebase-apply/patch:288: new blank line at EOF.
+
.git/rebase-apply/patch:1162: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in sysdeps/vinix/generic/generic.cpp
Auto-merging sysdeps/vinix/generic/generic.cpp
error: Failed to merge in the changes.
Patch failed at 0001 Vinix specific changes
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
xbstrap: Action patch of source mlibc failed
make: *** [Makefile:29: distro] Error 1

[Ccode-lang]

Can't reproduce. Are you running with any special options?

[JalonSolov]

No. git pull then make distro. No local changes at all.

[mintsuki]

Do a full rebuild:

make distclean
make distro