Optional: I suggest in the future avoid whitespacing cleanups of unrelated functions in the patches. While is far to cleanup function you are modifying, a change to an unrelated function doesn't bring much benefit to the patch itself. Those can cleaned up in separated changes.