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 (from parent 1:
e162080
)
change the ordering for now, I'll alter vserver patch later
author
S.Çağlar Onur
<caglar@cs.princeton.edu>
Wed, 18 Aug 2010 18:42:31 +0000
(14:42 -0400)
committer
S.Çağlar Onur
<caglar@cs.princeton.edu>
Wed, 18 Aug 2010 18:42:31 +0000
(14:42 -0400)
kernel-2.6.spec
patch
|
blob
|
history
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
c71cc74
..
c99eadc
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-149,8
+149,6
@@
Source30: %{kernelconfig}-%{kversion}-i686-xenU.config
Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
%endif
Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
%endif
-Patch001: 52.patch
-
Patch010: linux-2.6-010-e1000e-ich10lan.patch
Patch017: linux-2.6-017-bnx2.patch
Patch010: linux-2.6-010-e1000e-ich10lan.patch
Patch017: linux-2.6-017-bnx2.patch
@@
-162,6
+160,8
@@
Patch220: delta-ptrace-fix01.diff
Patch230: delta-pivot-fix01.diff
Patch240: delta-killperm-fix01.diff
Patch230: delta-pivot-fix01.diff
Patch240: delta-killperm-fix01.diff
+Patch241: 52.patch
+
# IP sets
Patch250: linux-2.6-250-ipsets.patch
# IP sets
Patch250: linux-2.6-250-ipsets.patch
@@
-357,8
+357,6
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 0
%endif
%ApplyPatch 0
%endif
-%ApplyPatch 1
-
%ApplyPatch 10
%ApplyPatch 17
%ApplyPatch 10
%ApplyPatch 17
@@
-370,6
+368,8
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 230
%ApplyPatch 240
%ApplyPatch 230
%ApplyPatch 240
+%ApplyPatch 241
+
%ApplyPatch 250
%ApplyPatch 500
%ApplyPatch 250
%ApplyPatch 500