git://git.onelab.eu / linux-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b7ea13)
Rebasing mlab tree to mainline 2.6.22 branch
authorDaniel Hokka Zakrisson <dhokka@cs.princeton.edu>
Thu, 8 Jan 2009 18:46:44 +0000 (18:46 +0000)
committerSapan Bhatia <gwsapan@gmail.com>
Fri, 25 May 2012 08:49:18 +0000 (04:49 -0400)
Disable VNET+.
Add backport of the file permission cleanups done in 2.6.27, and a new capability to allow writing to /proc.

kernel-2.6.spec patch | blob | history

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6f21d28..6032769 100644 (file)
--- 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
linux-2.6