diff options
-rw-r--r-- | .topdeps | 2 | ||||
-rw-r--r-- | .topmsg | 17 |
2 files changed, 4 insertions, 15 deletions
@@ -1 +1 @@ -baseline +t/master_backports @@ -1,15 +1,4 @@ -Subject: Backports from master. +Subject: [PATCH] ____longjmp_chk for GNU Hurd on x86 -Use ``git cherry-pick -x SHA1''. - -The ChangeLog hunk (which failed to apply) goes into ChangeLog.SHA1. - -After ``tg update'' (and possibly dealing with merge conflicts), check which -can be removed: - - $ for c in ChangeLog.???*; do sha1=$(expr "$c" : 'ChangeLog.\(.*\)') && git rev-list HEAD | grep -q "$sha1" && echo "$sha1 has been merged"; done - -Check this, and remove the ChangeLog.SHA1. - -If there are no backports, ``git diff baseline'' must only show the .top* -files on t/master_backports. +The guts have been merged, but there are still TODOs to be resolved in +sysdeps/mach/hurd/i386/____longjmp_chk.S, and testing is needed. |