rpms/kernel/F-12 kernel.spec,1.1984,1.1985

[Josef Bacik]

Author: josef

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23484

Modified Files:
	kernel.spec 
Log Message:
- fix null pointer deref in btrfs acl code



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1984
retrieving revision 1.1985
diff -u -p -r1.1984 -r1.1985
--- kernel.spec	13 Jan 2010 06:31:01 -0000	1.1984
+++ kernel.spec	14 Jan 2010 20:53:54 -0000	1.1985
@@ -732,6 +732,9 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 Patch3050: linux-2.6-nfsd4-proots.patch
 Patch3051: linux-2.6-nfs4-callback-hidden.patch
 
+# btrfs
+Patch3100: linux-2.6-btrfs-fix-acl.patch
+
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
 
@@ -1209,6 +1212,7 @@ ApplyPatch linux-2.6-execshield.patch
 # xfs
 
 # btrfs
+ApplyPatch linux-2.6-btrfs-fix-acl.patch
 
 # eCryptfs
 
@@ -2021,6 +2025,9 @@ fi
 # and build.
 
 %changelog
+* Thu Jan 14 2010 Josef Bacik <josef at toxicpanda.com> 2.6.32.3-25
+- fix null pointer dereference in btrfs acl code
+
 * Wed Jan 13 2010 Dave Airlie <airlied at redhat.com> 2.6.32.3-24
 - drm fixes from upstream - mostly printk stupids + integrate radeon s/r fix