Rolling stable kernels

Posted Oct 8, 2021 0:28 UTC (Fri) by amboar (subscriber, #55307)
In reply to: Rolling stable kernels by amboar
Parent article: Rolling stable kernels

Ugh, that should have been the other way around with respect to the branch state and merged tag, but the important bit was the existence of the "ours" merge strategy :)

Rolling stable kernels

Posted Oct 8, 2021 7:12 UTC (Fri) by pbonzini (subscriber, #60935) [Link] (1 responses)

Yes, exactly. What one would need here is a "theirs" merge strategy, but it doesn't exist.

Rolling stable kernels

Posted Mar 29, 2023 19:34 UTC (Wed) by tsaeger (subscriber, #116881) [Link]

I git-golf from time-to-time :)

# git merge -s "theirs"
THEIRS=v5.15.1
git merge -s ours --no-commit "${THEIRS}"
git read-tree -u --reset "${THEIRS}"
git commit --no-edit