rpms/kernel/F-10 linux-2.6-net-sch-drr-fix-u32-type.patch, NONE, 1.1 patch-2.6.29-rc4-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.979, 1.980 kernel.spec, 1.1253, 1.1254 linux-2.6-compile-fixes.patch, 1.186, 1.187 sources, 1.941, 1.942 upstream, 1.852, 1.853 linux-2.6-netdev-atl2.patch, 1.3, NONE patch-2.6.29-rc4-git1.bz2.sign, 1.1, NONE

Tue Feb 10 06:34:40 UTC 2009

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-compile-fixes.patch sources 
	upstream 
Added Files:
	linux-2.6-net-sch-drr-fix-u32-type.patch 
	patch-2.6.29-rc4-git2.bz2.sign 
Removed Files:
	linux-2.6-netdev-atl2.patch patch-2.6.29-rc4-git1.bz2.sign 
Log Message:
2.6.29-rc4-git2
Drop our redundant atl2 network driver patch.
Fix type in header so iptables will build.

linux-2.6-net-sch-drr-fix-u32-type.patch:

--- NEW FILE linux-2.6-net-sch-drr-fix-u32-type.patch ---
Using u32 in this header breaks the build of iptables.

Signed-off-by: Chuck Ebbert <cebbert at redhat.com>

Index: linux-2.6.28.noarch/include/linux/pkt_sched.h
===================================================================
--- linux-2.6.28.noarch.orig/include/linux/pkt_sched.h
+++ linux-2.6.28.noarch/include/linux/pkt_sched.h
@@ -515,7 +515,7 @@ enum
 
 struct tc_drr_stats
 {
-	u32	deficit;
+	__u32	deficit;
 };
 
 #endif


--- NEW FILE patch-2.6.29-rc4-git2.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJkMP7yGugalF9Dw4RAu2fAJ9WJY9JPcIjwj2lJjDkfTMXbcvYsQCdHz36
yZyu34MNo9KzfgypOZERYa8=
=d2oi
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.979
retrieving revision 1.980
diff -u -r1.979 -r1.980
--- .cvsignore	9 Feb 2009 04:49:20 -0000	1.979
+++ .cvsignore	10 Feb 2009 06:34:09 -0000	1.980
@@ -5,4 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git1.bz2
+patch-2.6.29-rc4-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1253
retrieving revision 1.1254
diff -u -r1.1253 -r1.1254
--- kernel.spec	9 Feb 2009 21:10:49 -0000	1.1253
+++ kernel.spec	10 Feb 2009 06:34:09 -0000	1.1254
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 1
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -643,9 +643,6 @@
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
-# atl2 network driver
-Patch2020: linux-2.6-netdev-atl2.patch
-
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
@@ -664,6 +661,8 @@
 
 Patch9001: revert-fix-modules_install-via-nfs.patch
 
+Patch9090: linux-2.6-net-sch-drr-fix-u32-type.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1146,9 +1145,6 @@
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
-# atl2 network driver
-ApplyPatch linux-2.6-netdev-atl2.patch
-
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
 ApplyPatch linux-2.6-kvmclock-unsync-tsc-workaround.patch
@@ -1171,7 +1167,9 @@
 # revert 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
-# END OF PATCH APPLICATIONS
+ApplyPatch linux-2.6-net-sch-drr-fix-u32-type.patch
+
+# ======= END OF PATCH APPLICATIONS =============================
 
 %endif
 
@@ -1747,6 +1745,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Feb 10 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.29.0.24.rc4.git2
+- 2.6.29-rc4-git2
+- Drop our redundant atl2 network driver patch.
+- Fix type in header so iptables will build.
+
 * Mon Feb 09 2009 Kyle McMartin <kyle at redhat.com>  2.6.29.0.23.rc4.git1
 - Enable CONFIG_X86_BIGSMP, to enable support for more than 8 cpus,
   since we have NR_CPUS=32...

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-compile-fixes.patch,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- linux-2.6-compile-fixes.patch	8 Feb 2009 20:29:54 -0000	1.186
+++ linux-2.6-compile-fixes.patch	10 Feb 2009 06:34:09 -0000	1.187
@@ -4,77 +4,3 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
-From: Kyle McMartin <kyle at redhat.com>
-
-Architectures other than mips and x86 are not using ticket
-spinlocks. Therefore, the contention on the lock is meaningless,
-since there is nobody known to be waiting on it (arguably /fairly/
-unfair locks) Dummy it out to return 0 on other architectures.
-
-Signed-off-by: Kyle McMartin <kyle at redhat.com>
----
-
-fixes:
-  btrfs does not build on ppc64
-  http://marc.info/?l=linux-kernel&m=123404002114219&w=2
-  fs/btrfs/locking.c: In function 'btrfs_path_lock_waiting':
-  fs/btrfs/locking.c:254: error: implicit declaration of function '__raw_spin_is_contended'
-
- arch/mips/include/asm/spinlock.h |    1 +
- arch/x86/include/asm/paravirt.h  |    1 +
- arch/x86/include/asm/spinlock.h  |    1 +
- include/linux/spinlock.h         |    5 +++++
- 4 files changed, 8 insertions(+), 0 deletions(-)
-diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
-index 1a1f320..0884947 100644
---- a/arch/mips/include/asm/spinlock.h
-+++ b/arch/mips/include/asm/spinlock.h
-@@ -51,6 +51,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
- 
- 	return (((counters >> 14) - counters) & 0x1fff) > 1;
- }
-+#define __raw_spin_is_contended	__raw_spin_is_contended
- 
- static inline void __raw_spin_lock(raw_spinlock_t *lock)
- {
-diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index ba3e2ff..c09a141 100644
---- a/arch/x86/include/asm/paravirt.h
-+++ b/arch/x86/include/asm/paravirt.h
-@@ -1402,6 +1402,7 @@ static inline int __raw_spin_is_contended(struct raw_spinlock *lock)
- {
- 	return PVOP_CALL1(int, pv_lock_ops.spin_is_contended, lock);
- }
-+#define __raw_spin_is_contended	__raw_spin_is_contended
- 
- static __always_inline void __raw_spin_lock(struct raw_spinlock *lock)
- {
-diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index d17c919..8247e94 100644
---- a/arch/x86/include/asm/spinlock.h
-+++ b/arch/x86/include/asm/spinlock.h
-@@ -245,6 +245,7 @@ static inline int __raw_spin_is_contended(raw_spinlock_t *lock)
- {
- 	return __ticket_spin_is_contended(lock);
- }
-+#define __raw_spin_is_contended	__raw_spin_is_contended
- 
- static __always_inline void __raw_spin_lock(raw_spinlock_t *lock)
- {
-diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
-index e0c0fcc..a0c66a2 100644
---- a/include/linux/spinlock.h
-+++ b/include/linux/spinlock.h
-@@ -124,7 +124,12 @@ do {								\
- #ifdef CONFIG_GENERIC_LOCKBREAK
- #define spin_is_contended(lock) ((lock)->break_lock)
- #else
-+
-+#ifdef __raw_spin_is_contended
- #define spin_is_contended(lock)	__raw_spin_is_contended(&(lock)->raw_lock)
-+#else
-+#define spin_is_contended(lock)	(((void)(lock), 0))
-+#endif /*__raw_spin_is_contended*/
- #endif
- 
- /**


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.941
retrieving revision 1.942
diff -u -r1.941 -r1.942
--- sources	9 Feb 2009 04:49:21 -0000	1.941
+++ sources	10 Feb 2009 06:34:09 -0000	1.942
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c5daf3d0f43873d5c2b36ddaf8d77bab  patch-2.6.29-rc4.bz2
-7fcdf5fa892e19bb1b617304d78c47f0  patch-2.6.29-rc4-git1.bz2
+d15a75d2d8462d0a1a0d5e33604c08d9  patch-2.6.29-rc4-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- upstream	9 Feb 2009 04:49:21 -0000	1.852
+++ upstream	10 Feb 2009 06:34:09 -0000	1.853
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc4.bz2
-patch-2.6.29-rc4-git1.bz2
+patch-2.6.29-rc4-git2.bz2


--- linux-2.6-netdev-atl2.patch DELETED ---


--- patch-2.6.29-rc4-git1.bz2.sign DELETED ---


