rpms/kernel/devel .cvsignore, 1.1052, 1.1053 kernel.spec, 1.1522, 1.1523 linux-2.6-defaults-pci_no_msi.patch, 1.4, 1.5 upstream, 1.925, 1.926 at76-netdev_ops.patch, 1.1, NONE linux-2.6.29-pat-fixes.patch, 1.2, NONE

[Dave Jones]

Author: davej

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-defaults-pci_no_msi.patch 
	upstream 
Removed Files:
	at76-netdev_ops.patch linux-2.6.29-pat-fixes.patch 
Log Message:
2.6.30-rc2-git6


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1052
retrieving revision 1.1053
diff -u -r1.1052 -r1.1053
--- .cvsignore	17 Apr 2009 16:41:26 -0000	1.1052
+++ .cvsignore	20 Apr 2009 17:43:26 -0000	1.1053
@@ -7,4 +7,4 @@
 linux-2.6.29.tar.bz2
 patch-2.6.29-git15.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git3.bz2
+patch-2.6.30-rc2-git6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1522
retrieving revision 1.1523
diff -u -r1.1522 -r1.1523
--- kernel.spec	18 Apr 2009 04:09:54 -0000	1.1522
+++ kernel.spec	20 Apr 2009 17:43:26 -0000	1.1523
@@ -58,7 +58,7 @@
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 3
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -634,7 +634,6 @@
 
 Patch680: linux-2.6-rt2x00-asus-leds.patch
 Patch681: linux-2.6-mac80211-age-scan-results-on-resume.patch
-Patch684: at76-netdev_ops.patch
 
 Patch800: linux-2.6-crash-driver.patch
 
@@ -675,9 +674,6 @@
 
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
-# http://bugs.freedesktop.org/show_bug.cgi?id=20803
-Patch9210: linux-2.6.29-pat-fixes.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1186,7 +1182,6 @@
 
 # back-port scan result aging patches
 #ApplyPatch linux-2.6-mac80211-age-scan-results-on-resume.patch
-ApplyPatch at76-netdev_ops.patch
 
 # /dev/crash driver.
 ApplyPatch linux-2.6-crash-driver.patch
@@ -1229,8 +1224,6 @@
 
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
-ApplyPatch linux-2.6.29-pat-fixes.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1824,6 +1817,9 @@
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Mon Apr 20 2009 Dave Jones <davej at redhat.com>
+- 2.6.30-rc2-git6
+
 * Sat Apr 18 2009 Chuck Ebbert <cebbert at redhat.com>
 - Set CONFIG_UEVENT_HELPER_PATH to the empty string (#496296)
 

linux-2.6-defaults-pci_no_msi.patch:

Index: linux-2.6-defaults-pci_no_msi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-defaults-pci_no_msi.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-defaults-pci_no_msi.patch	4 Feb 2009 17:50:39 -0000	1.4
+++ linux-2.6-defaults-pci_no_msi.patch	20 Apr 2009 17:43:27 -0000	1.5
@@ -1,10 +1,8 @@
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index d8362cf..30d6053 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -1674,6 +1674,9 @@ and is between 256 and 4096 characters. It is defined in the file
+--- linux-2.6.29.noarch/Documentation/kernel-parameters.txt~	2009-04-20 13:36:09.000000000 -0400
++++ linux-2.6.29.noarch/Documentation/kernel-parameters.txt	2009-04-20 13:36:33.000000000 -0400
+@@ -1723,6 +1723,9 @@ and is between 256 and 4096 characters. 
  				root domains (aka PCI segments, in ACPI-speak).
- 		nommconf	[X86-32,X86_64] Disable use of MMCONFIG for PCI
+ 		nommconf	[X86] Disable use of MMCONFIG for PCI
  				Configuration
 +		msi		[MSI] If the PCI_MSI kernel config parameter is
 +				enabled, this kernel boot option can be used to


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- upstream	17 Apr 2009 16:41:29 -0000	1.925
+++ upstream	20 Apr 2009 17:43:27 -0000	1.926
@@ -1,3 +1,3 @@
 linux-2.6.29.tar.bz2
 patch-2.6.30-rc2.bz2
-patch-2.6.30-rc2-git3.bz2
+patch-2.6.30-rc2-git6.bz2


--- at76-netdev_ops.patch DELETED ---


--- linux-2.6.29-pat-fixes.patch DELETED ---