From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 21 Oct 2008 14:49:55 +0000 (+0000)
Subject: Make the patch apply cleanly
X-Git-Tag: trellis-2.6.22-Jan-2009~1
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=01e400bf7a55b398ec125957954f0388d65e92dd

Make the patch apply cleanly
---

diff --git a/linux-2.6-760-unshare-netns-fix.patch b/linux-2.6-760-unshare-netns-fix.patch
index 1b1d3c31f..7de458118 100644
--- a/linux-2.6-760-unshare-netns-fix.patch
+++ b/linux-2.6-760-unshare-netns-fix.patch
@@ -152,8 +152,8 @@ diff -Nurb linux-2.6.22-600/kernel/vserver/space.c linux-2.6.22-601/kernel/vserv
  out:
  	return nsproxy;
  }
---- kernel/vserver/space.c.orig	2008-10-10 11:37:58.000000000 -0400
-+++ kernel/vserver/space.c	2008-10-20 13:36:17.000000000 -0400
+--- bla/kernel/vserver/space.c	2008-10-10 11:37:58.000000000 -0400
++++ bla/kernel/vserver/space.c	2008-10-20 13:36:17.000000000 -0400
 @@ -91,7 +91,7 @@
  		nsproxy->net_ns = new_nsproxy->net_ns;
  		if (nsproxy->net_ns) {