On Fri, Oct 17, 2025 at 12:38:20AM -0700, Enji Cooper (yaneurabeya) wrote: E> I’m not sure about the percentage Rick mentioned, but I think Mark’s comment about avoiding merge conflicts is a key point (for FreeBSD as well as downstream consumers of FreeBSD. E> Unnecessary churn can also make reconciling changes with other sources, e.g., NetBSD, OpenBSD, more difficult for little to no gain.
I will emphasize that such a sweeping commit that adds extra churn to main right when re@ is working on .0 release is not helpful at all. Right now re@ and anyone else who cares about 15.0-RELEASE would prefer no extra divergence betweem main and stable/15. If I a commit a bug fix right now around same lines that were touched by this commit, this bug fix will not be cherry-pickable to stable/15 and releng/15.0. P.S. I'm in favor of sweeping stylistic changes, but few weeks before branching a stable, not few weeks after. -- Gleb Smirnoff
