fix merge conflict

1 files changed, 19 insertions, 1 deletions

diff --git a/open_issues/pfinet_vs_system_time_changes.mdwn b/open_issues/pfinet_vs_system_time_changes.mdwn
index 714c8784..513cbc73 100644
--- a/open_issues/pfinet_vs_system_time_changes.mdwn
+++ b/open_issues/pfinet_vs_system_time_changes.mdwn
@@ -17,7 +17,7 @@ IRC, unknown channel, unknown date.
 
 This was very likely a misdiagnosis:
 
-IRC, freenode, #hurd, 2011-03-25
+IRC, freenode, #hurd, 2011-03-25:
 
     <tschwinge> antrik: I suspect it'S some timing stuff in pfinet that perhaps
       uses absolute time, and somehow wildely gets confused?
@@ -40,3 +40,21 @@ IRC, freenode, #hurd, 2011-03-25
     <tschwinge> (The other way round, you might likely get some integer
       wrap-around, and thus the same result.)
     <tschwinge> Yes.
+
+IRC, freenode, #hurd, 2011-10-26:
+
+    <antrik> anyways, when ntpdate adjusts to the past, the connections hang,
+      roughly for the amount of time being adjusted
+    <antrik> they do not die though
+    <antrik> (well, if it's long enough, they probably timeout on the other
+      side...)
+
+IRC, freenode, #hurd, 2011-10-27:
+
+    <antrik> oh, another interesting thing I observed is that the the subhurd
+      pfinet did *not* drop the connection... only the main Hurd one. I thought
+      the clock is system-wide?...
+    <tschwinge> It is.
+    <antrik> it's really fascinating that only the pfinet on the Hurd instance
+      where I set the date is affected, and not the pfinet in the other
+      instance