X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=3317bc5cea36af65349f425be1d0063f468207e3;hb=2beb387a7bfa8cbeba68af6d4691996ab1b61427;hp=683b88ddee6b9092587e65f61c3021d24a1e3334;hpb=af5f297016bc33b1f84ee32d9865821bf2d6cc25;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 683b88dde..3317bc5ce 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 45
+%define taglevel 46
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -217,6 +217,11 @@ 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
+
+Patch950: linux-2.6.950-ext3_backports.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
@@ -454,6 +459,12 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 800
 %ApplyPatch 810
 
+%if 0
+%ApplyPatch 900
+%ApplyPatch 910
+%endif
+
+%ApplyPatch 950
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.
@@ -929,6 +940,9 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* 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
+
 * Tue Mar 16 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-22-45
 - add support for ICH10