summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.topdeps2
-rw-r--r--.topmsg17
2 files changed, 4 insertions, 15 deletions
diff --git a/.topdeps b/.topdeps
index 180b47c18b..a4b3b1ff6d 100644
--- a/.topdeps
+++ b/.topdeps
@@ -1 +1 @@
-baseline
+t/master_backports
diff --git a/.topmsg b/.topmsg
index 8cb3f841da..ffafb64cf0 100644
--- a/.topmsg
+++ b/.topmsg
@@ -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.