Cherry-pick commits which have accumulated on the (non-serdev) master branch onto the (serdev) devel/revpi-5.10 branch so that the latter can become the new master branch once we move to kernel 6.1 (which is imminent).
Kernel 6.1 requires serdev, hence depends on an up-to-date devel/revpi-5.10 branch. That branch has diverged quite a bit from master over the past months.
The plan is to create a new revpi-5.10 branch (which is equivalent with current master), then force-push devel/revpi-5.10 to master and finally delete devel/revpi-5.10. The alternative, i.e. merging devel/revpi-5.10 into master, would be messy due to a number of non-trivial merge conflicts. (It wouldn't be impossible though if that's what's preferred, only more tedious.)
l1k
commented
1 year ago
Cherry-pick commits which have accumulated on the (non-serdev)
masterbranch onto the (serdev)devel/revpi-5.10branch so that the latter can become the newmasterbranch once we move to kernel 6.1 (which is imminent).Kernel 6.1 requires serdev, hence depends on an up-to-date
devel/revpi-5.10branch. That branch has diverged quite a bit frommasterover the past months.The plan is to create a new
revpi-5.10branch (which is equivalent with currentmaster), then force-pushdevel/revpi-5.10tomasterand finally deletedevel/revpi-5.10. The alternative, i.e. mergingdevel/revpi-5.10intomaster, would be messy due to a number of non-trivial merge conflicts. (It wouldn't be impossible though if that's what's preferred, only more tedious.)