From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here (was: Dynamic loading progress) Date: Fri, 13 Nov 2015 21:37:53 +0200 Message-ID: <837fllg06m.fsf@gnu.org> References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> <87io5bv1it.fsf@lifelogs.com> <87egfzuwca.fsf@lifelogs.com> <876118u6f2.fsf@lifelogs.com> <87io56qgid.fsf@lifelogs.com> <838u61g0sr.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447443526 2017 80.91.229.3 (13 Nov 2015 19:38:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 19:38:46 +0000 (UTC) Cc: jwiegley@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 20:38:37 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZxKB5-0004TK-7T for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 20:38:31 +0100 Original-Received: from localhost ([::1]:54840 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKAz-0001cm-Oy for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 14:38:25 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58389) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKAl-0001cg-GU for emacs-devel@gnu.org; Fri, 13 Nov 2015 14:38:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxKAk-00039V-MH for emacs-devel@gnu.org; Fri, 13 Nov 2015 14:38:11 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:41633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKAf-00037n-SZ; Fri, 13 Nov 2015 14:38:06 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NXR00700QAKTQ00@a-mtaout22.012.net.il>; Fri, 13 Nov 2015 21:38:04 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXR0078YQJGQM20@a-mtaout22.012.net.il>; Fri, 13 Nov 2015 21:38:04 +0200 (IST) In-reply-to: <838u61g0sr.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:194403 Archived-At: > Date: Fri, 13 Nov 2015 21:24:36 +0200 > From: Eli Zaretskii > Cc: emacs-devel@gnu.org > > 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.