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
Add NXF_LBACK_ALLOW.
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
857ebe5
..
fcd6d8a
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-27,11
+27,11
@@
Summary: The Linux kernel (the core of the Linux operating system)
# adding some text to the end of the version number.
#
%define sublevel 22
# adding some text to the end of the version number.
#
%define sublevel 22
-%define patchlevel 1
4
+%define patchlevel 1
8
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
%define kversion 2.6.%{sublevel}
%define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
-%define vsversion 2.3.0.
29
+%define vsversion 2.3.0.
32
# Will go away when VServer supports NetNS in mainline. Currently, it must be
# updated every time the PL kernel is updated.
# Will go away when VServer supports NetNS in mainline. Currently, it must be
# updated every time the PL kernel is updated.
@@
-148,6
+148,7
@@
Patch100: linux-2.6-100-build-nonintconfig.patch
# Linux-VServer
Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
Patch210: linux-2.6-210-vserver-cpu-sched.patch
# Linux-VServer
Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
Patch210: linux-2.6-210-vserver-cpu-sched.patch
+Patch220: linux-2.6-220-lback-feat02.diff
# IP sets
Patch250: linux-2.6-250-ipsets.patch
# IP sets
Patch250: linux-2.6-250-ipsets.patch
@@
-336,6
+337,7
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 200
%ApplyPatch 210
%ApplyPatch 200
%ApplyPatch 210
+%ApplyPatch 220
%ApplyPatch 250
%ApplyPatch 250