Comment by saltmate

That's not a solution, just the necessary work. You still have a stack of patches you continuously have to (have) rebase(d) on upstream.