X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=ff769e5a40665eb1773e81bc0e4aa5010c41a53a;hb=93402a3986e1087d2058b022109de933ded6702d;hp=fe8ad0136d8e51d5f2b99a4709c89d98dec5474d;hpb=816d4d71c855f3a92c494ab785fec73b7a2e1741;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index fe8ad0136..ff769e5a4 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -25,7 +25,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 39
+%define taglevel 42
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -146,6 +146,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 %endif
 
 Patch010: linux-2.6-010-e1000e.patch
+Patch015: linux-2.6-015-igb.patch
 Patch020: linux-2.6-020-build-id.patch
 Patch030: linux-2.6-030-netns.patch
 Patch040: linux-2.6-040-i_mutex-check.patch
@@ -153,6 +154,9 @@ Patch040: linux-2.6-040-i_mutex-check.patch
 # These are patches picked up from Fedora/RHEL
 Patch100: linux-2.6-100-build-nonintconfig.patch
 
+Patch150: linux-2.6-150-cciss-allow-kexec-to-work.patch
+Patch151: linux-2.6-151-cciss-SAS.patch
+
 # Linux-VServer
 Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
 Patch210: linux-2.6-210-vserver-cpu-sched.patch
@@ -190,7 +194,8 @@ Patch670: linux-2.6-670-gcc43.patch
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 #Patch690: linux-2.6-690-web100.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
-Patch730: linux-2.6-730-igb-driver.patch
+
+Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -363,6 +368,7 @@ KERNEL_PREVIOUS=vanilla
 %endif
 
 %ApplyPatch 10
+%ApplyPatch 15
 %ApplyPatch 20
 
 # NetNS patch for VINI
@@ -373,6 +379,9 @@ KERNEL_PREVIOUS=vanilla
 
 %ApplyPatch 100
 
+%ApplyPatch 150
+%ApplyPatch 151
+
 %ApplyPatch 200
 %ApplyPatch 210
 %ApplyPatch 220
@@ -409,7 +418,8 @@ KERNEL_PREVIOUS=vanilla
 %endif
 %ApplyPatch 680
 %ApplyPatch 710
-%ApplyPatch 730
+
+%ApplyPatch 800
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -890,6 +900,13 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Fri Feb 19 2010 Daniel Hokka Zakrisson <dhozac@coblitz.com> linux-2.6-22-42.coblitz
+- Use CoBlitz support address
+- hardware support
+
+* Sun Nov  8 2009 Daniel Hokka Zakrisson <daniel@hozac.com> linux-2.6-22-40.coblitz
+- Tag CoBlitz kernel
+
 * Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
 - outputs the kernel-headers rpm as backported from 2.6.27