git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pid->real_pid to fetch netns across vserver contexts
[linux-2.6.git]
/
kernel-2.6-planetlab.spec
diff --git
a/kernel-2.6-planetlab.spec
b/kernel-2.6-planetlab.spec
index
b540da8
..
f32e640
100644
(file)
--- a/
kernel-2.6-planetlab.spec
+++ b/
kernel-2.6-planetlab.spec
@@
-155,6
+155,7
@@
Patch590: linux-2.6-590-trellis-mm1-netns.patch
Patch591: linux-2.6-591-unshare-netns.patch
Patch592: linux-2.6-592-ztun-sb.patch
Patch593: linux-2.6-593-egre.patch
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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@
-334,6
+335,7
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 591
%ApplyPatch 592
%ApplyPatch 593
%ApplyPatch 591
%ApplyPatch 592
%ApplyPatch 593
+%ApplyPatch 594
%endif
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
%endif
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may