The kernel-ark os-build branch has been rebased.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If you have a pending merge request, you will need to rebase your
source tree and force push so that things will cleanly merge.

As we did with 5.14, we have done this again for os-build, we expect
to keep it up as a cadence with every upstream release. This means we
will do it again when 5.16 releases, and again with 5.17... It is
difficult to manage a regularly rebased tree, because any outstanding
MR is invalidated and has to also be rebased.  But not doing somewhat
regular rebases can also be difficult in the spirit of the openness
that Fedora is based upon.  While there are plenty of ways to see
which patches we carry compared to upstream, some of those patches are
fairly old, and would not apply cleanly at all to a modern tree after
several releases were merged in with them.   As we have gotten into a
flow of things with merge requests, we can get to the point of very
few outstanding MRs towards the end of a release cycle, and that makes
it an opportune time to rebase the tree.  This also means that the
patches we carry should be no more than 1 release out of date, making
them easier to apply to various other trees.  I do realize that this
is a minor inconvenience every 2-3 months, but I believe the results
are worth it.

Thanks,
Justin
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux