Should I do the changes on my master and we'll ignore linux-fixes from now on?
I can create a 'next' branch based on my master with the current official master merged in, it you want.