Rebase to a newer upstream commit.