Mark merged patches

9 files changed, 16 insertions, 0 deletions

diff --git a/debian/patches/ext2fs_nowait.patch b/debian/patches/ext2fs_nowait.patch
index 061f9760..c38b3251 100644
--- a/debian/patches/ext2fs_nowait.patch
+++ b/debian/patches/ext2fs_nowait.patch
@@ -1,6 +1,8 @@
 Avoid waiting for disk I/O completion. This improves performance quite a bit,
 and should not be less safe.
 
+Merged upstream.
+
 diff --git a/ext2fs/dir.c b/ext2fs/dir.c
 index 66d8c8a..f0f52f7 100644
 --- a/ext2fs/dir.c
diff --git a/debian/patches/init_try_runsystem.gnu.patch b/debian/patches/init_try_runsystem.gnu.patch
index 817a6d84..045bec24 100644
--- a/debian/patches/init_try_runsystem.gnu.patch
+++ b/debian/patches/init_try_runsystem.gnu.patch
@@ -1,4 +1,6 @@
 Also try runsystem.gnu
+
+Almost merged upstream, ony runsystem.gnu remaining
 ---
  daemons/console-run.c |    7 +++++++
  init/init.c           |   24 ++++++++++++++++++++----
diff --git a/debian/patches/install-msgids.diff b/debian/patches/install-msgids.diff
index 305e0e0d..975d38e2 100644
--- a/debian/patches/install-msgids.diff
+++ b/debian/patches/install-msgids.diff
@@ -5,6 +5,8 @@
 	(install): Specify install-header and install-msgids as
 	prerequisites.
 
+merged upstream
+
 ---
  hurd/Makefile |    9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/patches/libdiskfs_self-reauth.patch b/debian/patches/libdiskfs_self-reauth.patch
index b3e048b2..24de3939 100644
--- a/debian/patches/libdiskfs_self-reauth.patch
+++ b/debian/patches/libdiskfs_self-reauth.patch
@@ -2,6 +2,8 @@
 
 http://lists.gnu.org/archive/html/bug-hurd/2011-03/msg00045.html
 
+Merged upstream
+
 diff --git a/libfshelp/fetch-root.c b/libfshelp/fetch-root.c
 index 54d3c0c..6585052 100644
 --- a/libfshelp/fetch-root.c
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
diff --git a/debian/patches/makedev_keep_options.patch b/debian/patches/makedev_keep_options.patch
index 69a57e48..f9674461 100644
--- a/debian/patches/makedev_keep_options.patch
+++ b/debian/patches/makedev_keep_options.patch
@@ -2,6 +2,8 @@ Add options -k and -K to MAKEDEV.sh to chose not to overwrite existing entries.
 
 TODO: submit to bug-hurd
 
+merged upstream
+
 Index: hurd/sutils/MAKEDEV.sh
 ===================================================================
 --- hurd.orig/sutils/MAKEDEV.sh	2010-07-01 18:14:22.000000000 +0200
diff --git a/debian/patches/makedev_parted_store.patch b/debian/patches/makedev_parted_store.patch
index 574d3047..f4d45294 100644
--- a/debian/patches/makedev_parted_store.patch
+++ b/debian/patches/makedev_parted_store.patch
@@ -3,6 +3,8 @@ Add option -p to MAKEDEV to use user-space parted stores for partition devices.
 TODO: use in installed system, test, and submit to bug-hurd. IIRC the issue with
 it was that the swapper does not like parted-based stores.
 
+merged upstream
+
 Index: hurd/sutils/MAKEDEV.sh
 ===================================================================
 --- hurd.orig/sutils/MAKEDEV.sh	2010-07-08 00:48:13.000000000 +0000
diff --git a/debian/patches/pflocal.patch b/debian/patches/pflocal.patch
index 3d9b3ac2..7ebba8d5 100644
--- a/debian/patches/pflocal.patch
+++ b/debian/patches/pflocal.patch
@@ -34,6 +34,7 @@
 	* socket.c (S_socket_connect): Create the server socket here...
 	(S_socket_accept): ... not here.
 
+merged upstream
 ---
  pflocal/connq.c  |  341 +++++++++++++++++++++++++++++--------------------------
  pflocal/connq.h  |   39 +++---
diff --git a/debian/patches/runsystem_setup_pflocal.patch b/debian/patches/runsystem_setup_pflocal.patch
index cd5a79eb..3f8a96ed 100644
--- a/debian/patches/runsystem_setup_pflocal.patch
+++ b/debian/patches/runsystem_setup_pflocal.patch
@@ -4,6 +4,7 @@ pipelines.
  daemons/runsystem.sh |    6 ++++++
  1 file changed, 6 insertions(+)
 
+merged upstream
 --- a/daemons/runsystem.sh
 +++ b/daemons/runsystem.sh
 @@ -53,6 +53,12 @@ function singleuser ()