On Mon, Jul 15, 2024 at 03:16:14PM -0600, Justin Forbes wrote: > Please rebase any pending MRs and repush. > > As we have done since 5.15, 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 6.11 releases, and again with 6.12... 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. I could do with some help on this trivial merge request (for RHEL, but I've no idea where to ask for help for RHEL kernel specifically): https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3199 Since rebasing it (as above) everything has gone wrong and I don't understand why or what to do next. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v -- _______________________________________________ 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, report it: https://pagure.io/fedora-infrastructure/new_issue
