$ git checkout upstream+patches
$ git rebase upstream

/* deal with conflicts */