X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=2b775125d5de65971c0996c5faa93ed6dec36b6a;hb=a3ca5fc0c889acbc7252094244be787e9833218d;hp=7d80777213a70cc8bcc7d38335faf9c317dd5824;hpb=022013db6e4c8ffa5c32d11495e4d4f210c23c0e;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 7d8077721..2b775125d 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -34,7 +34,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 46
+%define taglevel 47
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -168,6 +168,7 @@ Patch050: linux-2.6-050-getline.patch
 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
@@ -217,8 +218,8 @@ Patch800: linux-2.6-800-fix-4-bit-apicid-assumption.patch
 
 Patch810: linux-2.6-810-ich10.patch
 
-#Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
-#Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
+Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
 
 Patch950: linux-2.6.950-ext3_backports.patch
 
@@ -414,6 +415,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 100
 
 %ApplyPatch 150
+%ApplyPatch 151
 
 %ApplyPatch 200
 %ApplyPatch 210
@@ -459,10 +461,8 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 800
 %ApplyPatch 810
 
-%if 0
 %ApplyPatch 900
 %ApplyPatch 910
-%endif
 
 %ApplyPatch 950
 
@@ -941,6 +941,13 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Thu Apr 15 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-47
+- Tagging 22 branch with following changes;
+- * Make barrier=1 for ext3 filesystem,
+- * Support barriers on single device dm devices,
+- * Introduce various ext3 related fixes,
+- * Fix conflict between glibc-headers kernel-headers packages
+
 * Tue Mar 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-46
 - every released package should have a tag in svn, so remove updatelevel from naming scheme and also change the variable name