Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32437
Modified Files:
.cvsignore kernel.spec sources upstream
Added Files:
patch-2.6.29.1-rc1.bz2.sign
Removed Files:
linux-2.6-net-fix-gro-bug.patch
linux-2.6-net-xfrm-fix-spin-unlock.patch
linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
linux-2.6.29-pat-pci-change-prot-for-inherit.patch
Log Message:
Linux 2.6.29.1-rc1
Dropped patches, merged upstream:
linux-2.6-net-fix-gro-bug.patch
linux-2.6-net-xfrm-fix-spin-unlock.patch
linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
linux-2.6.29-pat-pci-change-prot-for-inherit.patch
--- NEW FILE patch-2.6.29.1-rc1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See
http://www.kernel.org/signature.html for info
iD8DBQBJ0qOsyGugalF9Dw4RAmZrAJ9bMgLl0oHNbV5lytSxMQCTnrB3agCfbX9g
kWDSFx19vGIDfo0pHVPrBQQ=
=Pgh3
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/.cvsignore,v
retrieving revision 1.1039
retrieving revision 1.1040
diff -u -r1.1039 -r1.1040
--- .cvsignore 24 Mar 2009 01:31:28 -0000 1.1039
+++ .cvsignore 31 Mar 2009 23:58:14 -0000 1.1040
@@ -5,3 +5,4 @@
temp-*
kernel-2.6.29
linux-2.6.29.tar.bz2
+patch-2.6.29.1-rc1.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1493
retrieving revision 1.1494
diff -u -r1.1493 -r1.1494
--- kernel.spec 31 Mar 2009 19:59:53 -0000 1.1493
+++ kernel.spec 31 Mar 2009 23:58:15 -0000 1.1494
@@ -37,9 +37,9 @@
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
# Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -699,15 +699,9 @@
Patch9003: linux-2.6-dropwatch-protocol.patch
# fix for net lockups, will be in 2.6.29.1
-Patch9100: linux-2.6-net-fix-gro-bug.patch
Patch9101: linux-2.6-net-fix-another-gro-bug.patch
-# fix locking in ipsec (#489764)
-Patch9200: linux-2.6-net-xfrm-fix-spin-unlock.patch
-
#
http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9208: linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-Patch9209: linux-2.6.29-pat-pci-change-prot-for-inherit.patch
Patch9210: linux-2.6.29-pat-fixes.patch
%endif
@@ -1284,13 +1278,8 @@
ApplyPatch linux-2.6-dropwatch-protocol.patch
-ApplyPatch linux-2.6-net-fix-gro-bug.patch
ApplyPatch linux-2.6-net-fix-another-gro-bug.patch
-ApplyPatch linux-2.6-net-xfrm-fix-spin-unlock.patch
-
-ApplyPatch linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
-ApplyPatch linux-2.6.29-pat-pci-change-prot-for-inherit.patch
ApplyPatch linux-2.6.29-pat-fixes.patch
# END OF PATCH APPLICATIONS
@@ -1876,6 +1865,14 @@
# and build.
%changelog
+* Tue Mar 31 2009 Chuck Ebbert <cebbert(a)redhat.com>
+- Linux 2.6.29.1-rc1
+- Dropped patches, merged upstream:
+ linux-2.6-net-fix-gro-bug.patch
+ linux-2.6-net-xfrm-fix-spin-unlock.patch
+ linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch
+ linux-2.6.29-pat-pci-change-prot-for-inherit.patch
+
* Tue Mar 31 2009 Eric Sandeen <sandeen(a)redhat.com>
- add fiemap.h to kernel-headers
- build ext4 (and jbd2 and crc16) into the kernel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/sources,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -r1.1001 -r1.1002
--- sources 24 Mar 2009 01:31:28 -0000 1.1001
+++ sources 31 Mar 2009 23:58:15 -0000 1.1002
@@ -1 +1,2 @@
64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2
+ed1a88e478d2b87ed7523420457e22c7 patch-2.6.29.1-rc1.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/upstream,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -r1.912 -r1.913
--- upstream 24 Mar 2009 01:31:28 -0000 1.912
+++ upstream 31 Mar 2009 23:58:15 -0000 1.913
@@ -1 +1,2 @@
linux-2.6.29.tar.bz2
+patch-2.6.29.1-rc1.bz2
--- linux-2.6-net-fix-gro-bug.patch DELETED ---
--- linux-2.6-net-xfrm-fix-spin-unlock.patch DELETED ---
--- linux-2.6.29-pat-change-is_linear_pfn_mapping-to-not-use-vm_pgoff.patch DELETED ---
--- linux-2.6.29-pat-pci-change-prot-for-inherit.patch DELETED ---