Rebase: update patch context after upstream change