Re: Freeze is almost here (was: Dynamic loading progress)

[Eli Zaretskii]

> Date: Fri, 13 Nov 2015 21:24:36 +0200
> From: Eli Zaretskii <address@hidden>
> Cc: address@hidden
> 
> We don't merge from master to the release branch, we merge in the
> opposite direction.  See gitmerge.el.  So I think the dynamic modules
> changes should be applied to emacs-25, and will then be merged to
> master in due time.

I see that you branched emacs-25 not from the latest master.  This
means all the commits since 9463abf will have to be cherry-picked from
master to the emacs-25 branch.