X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=3d8c0a7f8965fc8bae0b7ed529746a9134f4e5d6;hb=48f9cfefbb82dad581bdd45d9a316e2ec1a43e6b;hp=af976c79cb890305935cb9a80518ff7eee7e3faa;hpb=554ab4634bbb40f0ea7a4d8bc8b9f8e6ea98cc9f;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index af976c79c..3d8c0a7f8 100644
--- 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
-%define taglevel 23
+%define taglevel 26
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -181,6 +181,10 @@ Patch620: linux-2.6-620-kdb.patch
 Patch630: linux-2.6-630-sched-fix.patch
 Patch640: linux-2.6-640-netlink-audit-hack.patch
 Patch650: linux-2.6-650-hangcheck-reboot.patch
+Patch660: linux-2.6-660-nmi-watchdog-default.patch
+%if "%{distroname}" == "f9"
+Patch670: linux-2.6-670-gcc43.patch
+%endif
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -386,6 +390,11 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 630
 %ApplyPatch 640
 %ApplyPatch 650
+%ApplyPatch 660
+%if "%{distroname}" == "f9"
+%ApplyPatch 670
+%endif
+
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
@@ -847,6 +856,15 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Wed Sep 10 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-26
+- patch for building on f9/gcc-4.3, no functional change on other distros
+
+* Sun Aug 17 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-25
+- FUSE support.
+
+* Tue Aug 12 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-24
+- Enable nmi watchdog by default.
+
 * Mon Aug 04 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-23
 - Fixed a bug in my previous commit.