[diggan]

You could do it in a branch if you want to, doesn't matter, as long as the diff/patch is based on the branch where upstream does its main work.