This commit is contained in:
Josh Boyer 2011-09-09 10:16:11 -04:00
parent 9a1d0419ef
commit 512ca00d34
3 changed files with 6 additions and 18 deletions

View File

@ -1,12 +0,0 @@
--- linux-3.0.noarch/fs/ext4/inode.c~ 2011-09-02 11:50:56.206445843 -0400
+++ linux-3.0.noarch/fs/ext4/inode.c 2011-09-02 11:51:31.224323827 -0400
@@ -121,9 +121,6 @@ void ext4_evict_inode(struct inode *inod
trace_ext4_evict_inode(inode);
- mutex_lock(&inode->i_mutex);
- ext4_flush_completed_IO(inode);
- mutex_unlock(&inode->i_mutex);
ext4_ioend_wait(inode);
if (inode->i_nlink) {

View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3
#
%global baserelease 2
%global baserelease 0
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -82,7 +82,7 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
%define rcrev 4
%define rcrev 5
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@ -647,8 +647,6 @@ Patch09: linux-2.6-upstream-reverts.patch
Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
Patch200: ext4-lockdep.patch
Patch202: linux-2.6-debug-taint-vm.patch
Patch383: linux-2.6-defaults-aspm.patch
@ -1222,7 +1220,6 @@ ApplyPatch linux-2.6-i386-nx-emulation.patch
#
# ext4
ApplyPatch ext4-lockdep.patch
# xfs
@ -2041,6 +2038,9 @@ fi
# and build.
%changelog
* Fri Sep 09 2011 Josh Boyer <jwboyer@redhat.com> 3.1.0-0.rc5.git0.0
- Linux 3.1-rc5
* Wed Sep 07 2011 Josh Boyer <jwboyer@redhat.com>
- Add patch to fix oops when linking entities in ucvideo (rhbz 735437)

View File

@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
0b0f625fd2d97699e5dbf71554373e6b patch-3.1-rc4.bz2
12eca0e62e330950dff895a67b3c3087 patch-3.1-rc5.bz2