git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1fe99b2
)
Add Patch 595
author
Andy Bavier
<acb@cs.princeton.edu>
Fri, 7 Mar 2008 20:22:34 +0000
(20:22 +0000)
committer
Andy Bavier
<acb@cs.princeton.edu>
Fri, 7 Mar 2008 20:22:34 +0000
(20:22 +0000)
kernel-2.6-planetlab.spec
patch
|
blob
|
history
diff --git
a/kernel-2.6-planetlab.spec
b/kernel-2.6-planetlab.spec
index
f32e640
..
9f26d7a
100644
(file)
--- a/
kernel-2.6-planetlab.spec
+++ b/
kernel-2.6-planetlab.spec
@@
-156,7
+156,7
@@
Patch591: linux-2.6-591-unshare-netns.patch
Patch592: linux-2.6-592-ztun-sb.patch
Patch593: linux-2.6-593-egre.patch
Patch594: linux-2.6-594-new_ns_pid.patch
-
+Patch595: linux-2.6-595-vserver-new-netns.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
%description
@@
-336,6
+336,7
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 592
%ApplyPatch 593
%ApplyPatch 594
+%ApplyPatch 595
%endif
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may