I was aiming to just use the same patch file as I had given to upstream (generated by git), but OK I can reformat it...
I was aiming to just use the same patch file as I had given to upstream (generated by git), but OK I can reformat it...