rpms/kernel/devel patch-2.6.31-rc5-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.1106, 1.1107 kernel.spec, 1.1684, 1.1685 linux-2.6.30-hush-rom-warning.patch, 1.1, 1.2 sources, 1.1064, 1.1065 upstream, 1.978, 1.979

[Dave Jones]

Author: davej

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

Modified Files:
	.cvsignore kernel.spec linux-2.6.30-hush-rom-warning.patch 
	sources upstream 
Added Files:
	patch-2.6.31-rc5-git2.bz2.sign 
Log Message:
2.6.31-rc5-git2


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

iD8DBQBKdtH3yGugalF9Dw4RAiRrAJ4m9MKGonQeza4+wneXco/Y+PAFNACglOJw
+v9P/35ozWH2eXaSqweS1nc=
=soQn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -p -r1.1106 -r1.1107
--- .cvsignore	1 Aug 2009 03:45:35 -0000	1.1106
+++ .cvsignore	3 Aug 2009 16:48:20 -0000	1.1107
@@ -6,3 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git2.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1684
retrieving revision 1.1685
diff -u -p -r1.1684 -r1.1685
--- kernel.spec	3 Aug 2009 15:55:46 -0000	1.1684
+++ kernel.spec	3 Aug 2009 16:48:20 -0000	1.1685
@@ -61,7 +61,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 5
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -111,7 +111,7 @@ Summary: The Linux kernel
 %define doc_build_fail true
 %endif
 
-%define rawhide_skip_docs 0
+%define rawhide_skip_docs 1
 %if 0%{?rawhide_skip_docs}
 %define with_doc 0
 %endif
@@ -1945,6 +1945,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Dave Jones <davej at redhat.com> 2.6.31-0.122.rc5.git2
+- 2.6.31-rc5-git2
+
 * Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
 - (Attempt to) fix watermark setup on Intel 9xx parts.
 

linux-2.6.30-hush-rom-warning.patch:
 setup-res.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Index: linux-2.6.30-hush-rom-warning.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6.30-hush-rom-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6.30-hush-rom-warning.patch	27 Jul 2009 22:03:29 -0000	1.1
+++ linux-2.6.30-hush-rom-warning.patch	3 Aug 2009 16:48:20 -0000	1.2
@@ -1,11 +1,20 @@
 diff -up linux-2.6.30.noarch/drivers/pci/setup-res.c.jx linux-2.6.30.noarch/drivers/pci/setup-res.c
 --- linux-2.6.30.noarch/drivers/pci/setup-res.c.jx	2009-07-27 17:56:13.000000000 -0400
 +++ linux-2.6.30.noarch/drivers/pci/setup-res.c	2009-07-27 17:58:25.000000000 -0400
-@@ -109,7 +109,13 @@ int pci_claim_resource(struct pci_dev *d
+@@ -101,6 +101,7 @@ int pci_claim_resource(struct pci_dev *d
+ 	struct resource *res = &dev->resource[resource];
+ 	struct resource *root;
+ 	int err;
++	const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
+ 
+ 	root = pci_find_parent_resource(dev, res);
+ 
+@@ -108,8 +109,13 @@ int pci_claim_resource(struct pci_dev *d
  	if (root != NULL)
- 		err = insert_resource(root, res);
+ 		err = request_resource(root, res);
  
 -	if (err) {
+-		const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
 +	if (err && resource == 6) {
 +		dev_info(&dev->dev, "BAR %d: %s of %s %pR\n",
 +			resource,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1064
retrieving revision 1.1065
diff -u -p -r1.1064 -r1.1065
--- sources	1 Aug 2009 03:45:36 -0000	1.1064
+++ sources	3 Aug 2009 16:48:20 -0000	1.1065
@@ -1,2 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 09d608a6f10801d34097d0e127e36d5b  patch-2.6.31-rc5.bz2
+5c7a3da1d852b5db22228947440a0da9  patch-2.6.31-rc5-git2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -p -r1.978 -r1.979
--- upstream	1 Aug 2009 03:45:36 -0000	1.978
+++ upstream	3 Aug 2009 16:48:20 -0000	1.979
@@ -1,2 +1,3 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc5.bz2
+patch-2.6.31-rc5-git2.bz2