In a nutshell, do the following in the emacs-25 branch's checkout:

   git cherry-pick -x SHA1 -e

where SHA1 is the hash of the commit you want to cherry-pick.  The -e
switch will let you edit the commit message, which is needed for
adding the "backport" thing.