rpms/kernel/devel patch-2.6.29-rc6-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.1025, 1.1026 kernel.spec, 1.1362, 1.1363 linux-2.6-hotfixes.patch, 1.4, 1.5 sources, 1.986, 1.987 upstream, 1.898, 1.899 ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch, 1.1, NONE linux-2.6-libertas-netpriv-fixes.patch, 1.1, NONE patch-2.6.29-rc6-git5.bz2.sign, 1.1, NONE

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5105

Modified Files:
	.cvsignore kernel.spec linux-2.6-hotfixes.patch sources 
	upstream 
Added Files:
	patch-2.6.29-rc6-git6.bz2.sign 
Removed Files:
	ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch 
	linux-2.6-libertas-netpriv-fixes.patch 
	patch-2.6.29-rc6-git5.bz2.sign 
Log Message:
2.6.29-rc6-git6


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

iD8DBQBJrHVxyGugalF9Dw4RAiEGAJ0eLlBZStiVw7ThPY5jwdI5fHGBugCeOy4o
ELXG+/devfwfgZByv6LdHOA=
=lGW3
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1025
retrieving revision 1.1026
diff -u -r1.1025 -r1.1026
--- .cvsignore	28 Feb 2009 15:35:25 -0000	1.1025
+++ .cvsignore	3 Mar 2009 02:01:55 -0000	1.1026
@@ -6,4 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git5.bz2
+patch-2.6.29-rc6-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1362
retrieving revision 1.1363
diff -u -r1.1362 -r1.1363
--- kernel.spec	2 Mar 2009 23:09:52 -0000	1.1362
+++ kernel.spec	3 Mar 2009 02:01:55 -0000	1.1363
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -660,14 +660,9 @@
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
 
-Patch2250: ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch
-
 Patch2300: linux-2.6.28-sunrpc-ipv6-rpcbind.patch
 Patch2301: linux-2.6.28-lockd-svc-register.patch
 
-# fix libertas problem for olpc (http://lists.infradead.org/pipermail/libertas-dev/2009-February/002297.html)
-Patch2400: linux-2.6-libertas-netpriv-fixes.patch
-
 # Quiet boot fixes
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
@@ -1176,8 +1171,6 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
-ApplyPatch linux-2.6-libertas-netpriv-fixes.patch
-
 ApplyPatch agp-set_memory_ucwb.patch
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
@@ -1194,9 +1187,6 @@
 #ApplyPatch linux-2.6-firewire-git-pending.patch
 #fi
 
-# fix oops with CONFIG_NET_NS=y
-ApplyPatch ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch
-
 # Fix NFS
 ApplyPatch linux-2.6.28-sunrpc-ipv6-rpcbind.patch
 
@@ -1795,7 +1785,10 @@
 # and build.
 
 %changelog
-* Tue Mar 03 2009 Ben Skeggs <bskeggs at redhat.com>
+* Mon Mar 02 2009 Dave Jones <davej at redhat.com> 2.6.29-0.183.rc6.git6
+- 2.6.29-rc6-git6
+
+* Mon Mar 02 2009 Ben Skeggs <bskeggs at redhat.com>
 - CONFIG_DRM_NOUVEAU_KMS got enabled somewhere, lets not do that yet
 
 * Mon Mar 02 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.179.rc6.git5

linux-2.6-hotfixes.patch:

Index: linux-2.6-hotfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-hotfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-hotfixes.patch	28 Feb 2009 15:35:26 -0000	1.4
+++ linux-2.6-hotfixes.patch	3 Mar 2009 02:01:55 -0000	1.5
@@ -1,60 +0,0 @@
-Ingo Molnar (1):
-      x86: i915 needs pgprot_writecombine() and is_io_mapping_possible()
-
-
- arch/x86/mm/iomap_32.c |   15 ++++-----------
- arch/x86/mm/pat.c      |    2 ++
- 2 files changed, 6 insertions(+), 11 deletions(-)
-
-diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index 6c2b1af..04102d4 100644
---- a/arch/x86/mm/iomap_32.c
-+++ b/arch/x86/mm/iomap_32.c
-@@ -20,23 +20,16 @@
- #include <asm/pat.h>
- #include <linux/module.h>
- 
--#ifdef CONFIG_X86_PAE
--int
--is_io_mapping_possible(resource_size_t base, unsigned long size)
--{
--	return 1;
--}
--#else
--int
--is_io_mapping_possible(resource_size_t base, unsigned long size)
-+int is_io_mapping_possible(resource_size_t base, unsigned long size)
- {
-+#ifndef CONFIG_X86_PAE
- 	/* There is no way to map greater than 1 << 32 address without PAE */
- 	if (base + size > 0x100000000ULL)
- 		return 0;
--
-+#endif
- 	return 1;
- }
--#endif
-+EXPORT_SYMBOL_GPL(is_io_mapping_possible);
- 
- /* Map 'pfn' using fixed map 'type' and protections 'prot'
-  */
-diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index aebbf67..e0ab173 100644
---- a/arch/x86/mm/pat.c
-+++ b/arch/x86/mm/pat.c
-@@ -11,6 +11,7 @@
- #include <linux/bootmem.h>
- #include <linux/debugfs.h>
- #include <linux/kernel.h>
-+#include <linux/module.h>
- #include <linux/gfp.h>
- #include <linux/mm.h>
- #include <linux/fs.h>
-@@ -868,6 +869,7 @@ pgprot_t pgprot_writecombine(pgprot_t prot)
- 	else
- 		return pgprot_noncached(prot);
- }
-+EXPORT_SYMBOL_GPL(pgprot_writecombine);
- 
- #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_X86_PAT)
- 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.986
retrieving revision 1.987
diff -u -r1.986 -r1.987
--- sources	28 Feb 2009 15:35:26 -0000	1.986
+++ sources	3 Mar 2009 02:01:56 -0000	1.987
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 26f67d99666834cc579094619821d3c8  patch-2.6.29-rc6.bz2
-c9924c779a427f2b57cd201fbef62cee  patch-2.6.29-rc6-git5.bz2
+2bd40cb2f0f7ea71abb95a46e5ba84fe  patch-2.6.29-rc6-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -r1.898 -r1.899
--- upstream	28 Feb 2009 15:35:26 -0000	1.898
+++ upstream	3 Mar 2009 02:01:56 -0000	1.899
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git5.bz2
+patch-2.6.29-rc6-git6.bz2


--- ipv6-dont-use-tw-net-when-accounting-recycled-tw.patch DELETED ---


--- linux-2.6-libertas-netpriv-fixes.patch DELETED ---


--- patch-2.6.29-rc6-git5.bz2.sign DELETED ---