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
Tagging module linux-2.6 - linux-2.6-22-31
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
3a00648
..
9ded770
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-24,7
+24,7
@@
Summary: The Linux kernel (the core of the Linux operating system)
# for module-tag.py - sublevel is used for the version (middle) part of tag names
%define name linux-2.6
%define module_version_varname sublevel
# for module-tag.py - sublevel is used for the version (middle) part of tag names
%define name linux-2.6
%define module_version_varname sublevel
-%define taglevel 3
0
+%define taglevel 3
1
#
# Polite request for people who spin their own kernel rpms:
#
# Polite request for people who spin their own kernel rpms:
@@
-184,6
+184,8
@@
Patch660: linux-2.6-660-nmi-watchdog-default.patch
%if "%{distroname}" == "f9"
Patch670: linux-2.6-670-gcc43.patch
%endif
%if "%{distroname}" == "f9"
Patch670: linux-2.6-670-gcc43.patch
%endif
+Patch680: linux-2.6-680-htb-hysteresis-tso.patch
+Patch690: linux-2.6-690-web100.patch
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
# See also the file named 'sources' here for the related checksums
# NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@
-393,6
+395,8
@@
KERNEL_PREVIOUS=vanilla
%if "%{distroname}" == "f9"
%ApplyPatch 670
%endif
%if "%{distroname}" == "f9"
%ApplyPatch 670
%endif
+%ApplyPatch 680
+%ApplyPatch 690
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@
-855,6
+859,9
@@
rm -f /lib/modules/%{KVERREL}uml/modules.*
%endif
%changelog
%endif
%changelog
+* Tue Dec 02 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-31
+- add patches for m-lab and drl
+
* Tue Nov 11 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-30
- Use Intel's e1000e driver.
* Tue Nov 11 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-30
- Use Intel's e1000e driver.