SPECS (LINUX_2_6_22): kernel.spec - Release 2. Added ocfs2 fixes.

[matkor]

Author: matkor                       Date: Sat Dec 29 14:12:31 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- Release 2. Added ocfs2 fixes.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.33 -> 1.441.2.1796.2.34) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.33 SPECS/kernel.spec:1.441.2.1796.2.34
--- SPECS/kernel.spec:1.441.2.1796.2.33	Fri Dec 14 21:56:12 2007
+++ SPECS/kernel.spec	Sat Dec 29 15:12:24 2007
@@ -118,7 +118,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			1
+%define		_rel			2
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20070806
@@ -340,6 +340,11 @@
 Patch140:	linux-2.6-unionfs-2.1.1.patch
 Patch141:	kernel-unionfs-vserver.patch
 
+
+# Rationale for ocfs2 patches: http://oss.oracle.com/pipermail/ocfs2-users/2007-November/002175.html
+# http://www.kernel.org/pub/linux/kernel/people/mfasheh/ocfs2/backports/
+Patch150:	ocfs2_2.6.22.14_fixes-20071127-1.patch
+
 # aic94xx patch based on http://georgi.unixsol.org/programs/aic94xx_with_included_firmware_2.6.21.diff
 Patch160:	linux-2.6-aic94xx_with_included_firmware.patch
 
@@ -897,6 +902,7 @@
 # linux-2.6-sk98lin_v10.0.4.3.patch
 %patch60 -p1
 
+
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
 
@@ -935,6 +941,10 @@
 %patch140 -p1
 %{?with_vserver:%patch141 -p1}
 
+
+# ocfs2_2.6.22.14_fixes-20071127-1.patch
+%patch150 -p1
+
 # aic94xx linux-2.6-aic94xx_with_included_firmware.patch
 %patch160 -p1
 
@@ -1688,6 +1698,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.34  2007-12-29 14:12:24  matkor
+- Release 2. Added ocfs2 fixes.
+
 Revision 1.441.2.1796.2.33  2007-12-14 20:56:12  arekm
 - up to 2.6.22.15
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1796.2.33&r2=1.441.2.1796.2.34&f=u