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

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 205a6debb..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 41
+%define taglevel 42
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -154,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
@@ -192,6 +195,8 @@ 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
 
+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
 # see http://bughost.org/bugzilla/show_bug.cgi?id=1584
@@ -374,6 +379,9 @@ KERNEL_PREVIOUS=vanilla
 
 %ApplyPatch 100
 
+%ApplyPatch 150
+%ApplyPatch 151
+
 %ApplyPatch 200
 %ApplyPatch 210
 %ApplyPatch 220
@@ -411,6 +419,8 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 680
 %ApplyPatch 710
 
+%ApplyPatch 800
+
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
@@ -890,6 +900,10 @@ 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