summaryrefslogtreecommitdiff
path: root/debian/patches/libpager_deadlock.patch
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-11-25 22:48:35 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-11-25 22:48:35 +0100
commit0fd99adfaf0255df26a540817e9eb09a456aeb45 (patch)
tree1425ebdfd0ddbb19848e91233ec077d8bd49e926 /debian/patches/libpager_deadlock.patch
parentd8b14c8b900138bbcaad4ca5e7b28f5e88aa4673 (diff)
Mark merged patches
Diffstat (limited to 'debian/patches/libpager_deadlock.patch')
-rw-r--r--debian/patches/libpager_deadlock.patch2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/libpager_deadlock.patch b/debian/patches/libpager_deadlock.patch
index ea2d9087..b9bc4e18 100644
--- a/debian/patches/libpager_deadlock.patch
+++ b/debian/patches/libpager_deadlock.patch
@@ -2,6 +2,8 @@ See http://lists.gnu.org/archive/html/bug-hurd/2010-03/msg00127.html
for the story. This should be completely safe, but Sergio believes
memory_object_lock_request shouldn't actually block.
+merged upstream
+
diff --git a/libpager/lock-object.c b/libpager/lock-object.c
index d108666..d8d4a1b 100644
--- a/libpager/lock-object.c