From: Don Zickus on
gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/commit/691f37398b27a8a10853eb...
Hi @knurd42
Let me take this piece by piece.
The 'git reset --hard master' was me thinking 'start from scratch' as
opposed to use existing 'ark-infra' and build on top. That was an
'oops' on my part and I can certainly incorporate your thoughts there.
And yes, starting with say an older 5.4 branch, your idea makes sense as
there should be *almost* no merge conflicts (except for the occasional
Makefile piece from 'sed', which should be very rare). And I am happy
to start the branch that way and just add on top the occasional updates
from redhat/.
Let me update my commit with the suggestions and then rebuild ark-infra
on top of 5.4.
Thanks for the feedback!