On Wed, Oct 25, 2023 at 05:11:51PM -0400, Paul Moore wrote: > #### stable-X.Y branch > > The stable-X.Y branch is intended for stable kernel patches and is based on > Linus' X.Y-rc1 tag, or a later X.Y.Z stable kernel release tag as needed. > If serious problems are identified and a patch is developed during the kernel's > release candidate cycle, it may be a candidate for stable kernel marking and > inclusion into the stable-X.Y branch. The main Linux kernel's documentation > on stable kernel patches has more information both on what patches may be > stable kernel candidates, and how to mark those patches appropriately; upstream > mailing list discussions on the merits of marking the patch for stable can also > be expected. Once a patch has been merged into the stable-X.Y branch and spent > a day or two in the next branch (see the next branch notes), it will be sent to > Linus for merging into the next release candidate or final kernel release (see > the notes on pull requests in this document). If the patch has been properly > marked for stable, the other stable kernel trees will attempt to backport the > patch as soon as it is present in Linus' tree, see the main Linux kernel > documentation for more details. > > Unless specifically requested, developers should not base their patches on the > stable-X.Y branch. Any merge conflicts that arise from merging patches > submitted upstream will be handled by the maintainer, although help and/or may > be requested in extreme cases. > > #### dev branch > > The dev branch is intended for development patches targeting the upcoming merge > window, and is based on Linus' latest X.Y-rc1 tag, or a later rc tag as needed > to avoid serious bugs, merge conflicts, or other significant problems. This > branch is the primary development branch where the majority of patches are > merged during the normal kernel development cycle. Patches merged into the > dev branch will be present in the next branch (see the next branch notes) and > will be sent to Linus during the next merge window. > > Developers should use the dev branch a stable basis for their own development > work, only under extreme circumstances will the dev branch be rebased during > the X.Y-rc cycle and the maintainer will be responsible for resolving any > merge conflicts, although help and/or may be requested in extreme cases. > If I have patches targetting current (not next) release cycle, either for stabilizing that cycle or for stable backports, I have to base it on dev branch (not stable-X.Y), right? Confused... -- An old man doll... just what I always wanted! - Clara
Attachment:
signature.asc
Description: PGP signature
