[Openpvrsgx-devgroup] New version of letux-pvrsrvkm rebased on v5.5.0-rc5 available

Tony Lindgren tony at atomide.com
Mon Jan 6 17:58:19 CET 2020

* H. Nikolaus Schaller <hns at goldelico.com> [200106 16:46]:
> > Am 06.01.2020 um 17:38 schrieb Tony Lindgren <tony at atomide.com>:
> > If you want to keep merging things together into some master branch,
> > then that can be done after building a temporary new branch, and
> > doing git merge -s ours. That way the old branch need no rebasing ;)
> I'll think about how to best do it.

OK thanks. Something like this should work (untested):

$ git checkout -b openpvrsgx-v5.5 openpvrsgx-v5.4
rebase patches in openpvrsgx-v5.5
merge back the old master with strategy ours to avoid losing changes
$ git merge -s ours openpvrsgx/master
merge new openpvrsgx-v5.5 back into master branch
$ git checkout openpvrsgx/master
$ git merge openpvrsgx-v5.5



More information about the openpvrsgx-devgroup mailing list