From: Daniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Date: Thu, 8 Jan 2009 18:46:44 +0000 (+0000)
Subject: Rebasing mlab tree to mainline 2.6.22 branch
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3daec8504eebd9c0ceddeffa151f425707a930f2;p=linux-2.6.git

Rebasing mlab tree to mainline 2.6.22 branch

Disable VNET+.
Add backport of the file permission cleanups done in 2.6.27, and a new capability to allow writing to /proc.
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6f21d2855..60327692f 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -432,7 +432,6 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 526
 %ApplyPatch 527
 %ApplyPatch 528
-
 %ApplyPatch 530
 %ApplyPatch 540
 %ApplyPatch 550
@@ -450,6 +449,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 670
 %endif
 %ApplyPatch 680
+%ApplyPatch 690
 %ApplyPatch 700
 %ApplyPatch 710
 %ApplyPatch 720