Could you please fix up whitespace in the patch, at least leading tabs
and trailing whitespace?
On the patch it is easy to do, something like:
sed 's/^+\([\t]*\) \{64\}/+\1\t\t\t\t\t\t\t\t/;s/^+\([\t]*\) \{32\}/+\1\t\t\t\t/;s/^+\([\t]*\) \{16\}/+\1\t\t/;s/^+\([\t]*\) \{8\}/+\1\t/;s/^+\(.*[^[:blank:]]\)[[:blank:]]\+$/+\1/;s/^+[[:blank:]]\+$/+/' patch> patch.whitespace
and then interdiff patch patch.whitespace> whitespace
and review that diff and if appropriate commit to branch before merging?
Jakub