quoted

There's a conflict due to 8f57e4d930d, how should I fix it?

I think we can thus drop my patch - that commit fixes the issue that
Andrew had reported as well, and that I worked around by casting the
result... now that abs() has a consistent result, using s32 in both
sides of the min() is perfectly fine.

johannes