I should probably also add that if any of the branches scheduled for merge prior to 4.1 contain/require changes to "fold", perhaps for additional transformations they need, I'll be glad to review/approve those specific changes now, ahead of their branch's planned merge dates to allow them to synchronize fold-const.c prior/during the current "reconstruction". This should minimize or eliminate the conflict headaches for pending branch maintainers (for this source file at least).
I hope this seems reasonable to everyone. During this stage of reorganization there are no external/visible API changes, so source files other than fold-const.c are/will be unaffected. Hopefully everyone should find this satisfactory. Mark, are you OK with this single source file exception/tweak to the current plan/rules? I'd expect few, if any, of the development branches contain any changes to fold, and they're welcome to maintain those changes locally until the prescribed time, but I thought I'd make the offer anyway. Roger --
