rpms/kernel/devel patch-2.6.30-git22.bz2.sign, NONE, 1.1 .cvsignore, 1.1084, 1.1085 Makefile, 1.104, 1.105 config-debug, 1.24, 1.25 config-generic, 1.292, 1.293 config-nodebug, 1.33, 1.34 config-s390x, 1.15, 1.16 kernel.spec, 1.1587, 1.1588 linux-2.6-defaults-pci_no_msi.patch, 1.5, 1.6 sources, 1.1042, 1.1043 upstream, 1.956, 1.957 linux-2.6-net-velocity-pktlen.patch, 1.1, NONE patch-2.6.30-git18.bz2.sign, 1.1, NONE

Wed Jun 24 18:38:28 UTC 2009

Author: davej

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

Modified Files:
	.cvsignore Makefile config-debug config-generic config-nodebug 
	config-s390x kernel.spec linux-2.6-defaults-pci_no_msi.patch 
	sources upstream 
Added Files:
	patch-2.6.30-git22.bz2.sign 
Removed Files:
	linux-2.6-net-velocity-pktlen.patch 
	patch-2.6.30-git18.bz2.sign 
Log Message:
2.6.30-git22

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

iD8DBQBKQhYByGugalF9Dw4RAq4dAJ9r3w+jek0BoF4mK32OpMFnNOlb0gCfZ/sq
F8qm2Xc5+Rg9BVzjnz1TyU4=
=Jbkn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1084
retrieving revision 1.1085
diff -u -p -r1.1084 -r1.1085
--- .cvsignore	22 Jun 2009 00:41:22 -0000	1.1084
+++ .cvsignore	24 Jun 2009 18:37:55 -0000	1.1085
@@ -5,4 +5,4 @@ kernel-2.6.*.config
 temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
-patch-2.6.30-git18.bz2
+patch-2.6.30-git22.bz2


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- Makefile	21 Jun 2009 22:22:50 -0000	1.104
+++ Makefile	24 Jun 2009 18:37:55 -0000	1.105
@@ -72,6 +72,7 @@ debug:
 	@perl -pi -e 's/# CONFIG_B43LEGACY_DEBUG is not set/CONFIG_B43LEGACY_DEBUG=y/' config-generic
 	@perl -pi -e 's/# CONFIG_MMIOTRACE is not set/CONFIG_MMIOTRACE=y/' config-nodebug
 	@perl -pi -e 's/CONFIG_STRIP_ASM_SYMS=y/# CONFIG_STRIP_ASM_SYMS is not set/' config-nodebug
+	@perl -pi -e 's/CONFIG_DEBUG_KMEMLEAK=y/# CONFIG_DEBUG_KMEMLEAK is not set/' config-nodebug
 
 	@# just in case we're going from extremedebug -> debug
 	@perl -pi -e 's/CONFIG_DEBUG_PAGEALLOC=y/# CONFIG_DEBUG_PAGEALLOC is not set/' config-nodebug
@@ -118,6 +119,7 @@ release:
 	@perl -pi -e 's/CONFIG_B43LEGACY_DEBUG=y/# CONFIG_B43LEGACY_DEBUG is not set/' config-generic
 	@perl -pi -e 's/CONFIG_MMIOTRACE=y/# CONFIG_MMIOTRACE is not set/' config-nodebug
 	@perl -pi -e 's/# CONFIG_STRIP_ASM_SYMS is not set/CONFIG_STRIP_ASM_SYMS=y/' config-nodebug
+	@perl -pi -e 's/# CONFIG_DEBUG_KMEMLEAK is not set/CONFIG_DEBUG_KMEMLEAK=y/' config-nodebug
 
 	@perl -pi -e 's/CONFIG_NR_CPUS=512/CONFIG_NR_CPUS=64/' config-x86_64-generic
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config-debug	8 Apr 2009 15:39:50 -0000	1.24
+++ config-debug	24 Jun 2009 18:37:55 -0000	1.25
@@ -50,3 +50,7 @@ CONFIG_DEBUG_NOTIFIERS=y
 CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
+
+CONFIG_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK_TEST is not set
+


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -p -r1.292 -r1.293
--- config-generic	21 Jun 2009 20:52:19 -0000	1.292
+++ config-generic	24 Jun 2009 18:37:55 -0000	1.293
@@ -87,6 +87,8 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIE_ECRC=y
+CONFIG_PCIEAER_INJECT=m
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_HOTPLUG_PCI_FAKE=m
 CONFIG_PCI_LEGACY=y
@@ -700,6 +702,7 @@ CONFIG_FUSION_LOGGING=y
 CONFIG_FIREWIRE=m
 CONFIG_FIREWIRE_OHCI=m
 CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
 CONFIG_FIREWIRE_OHCI_DEBUG=y
 # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
 
@@ -2617,6 +2620,7 @@ CONFIG_SND_CTXFI=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_HDA_INTEL=y
 CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -3178,6 +3182,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
+# CONFIG_NFS_V4_1 is not set
 CONFIG_NFS_DIRECTIO=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- config-nodebug	18 Jun 2009 19:05:53 -0000	1.33
+++ config-nodebug	24 Jun 2009 18:37:55 -0000	1.34
@@ -50,5 +50,6 @@ CONFIG_DMA_API_DEBUG=y
 
 CONFIG_MMIOTRACE=y
 
-# CONFIG_DEBUG_KMEMLEAK is not set
-CONFIG_DEBUG_KMEMLEAK_TEST=m
+CONFIG_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK_TEST is not set
+


Index: config-s390x
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-s390x,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- config-s390x	18 Jun 2009 19:05:53 -0000	1.15
+++ config-s390x	24 Jun 2009 18:37:55 -0000	1.16
@@ -226,3 +226,5 @@ CONFIG_SECCOMP=y
 CONFIG_PM=y
 CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION="/dev/jokes"
+
+CONFIG_PERF_COUNTERS=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1587
retrieving revision 1.1588
diff -u -p -r1.1587 -r1.1588
--- kernel.spec	22 Jun 2009 20:16:56 -0000	1.1587
+++ kernel.spec	24 Jun 2009 18:37:55 -0000	1.1588
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 18
+%define gitrev 22
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -676,8 +676,6 @@ Patch2903: linux-2.6-revert-dvb-net-kabi
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
-Patch4000: linux-2.6-net-velocity-pktlen.patch
-
 #snmp fixes
 Patch10000: linux-2.6-missing-rfc2465-stats.patch
 
@@ -1138,8 +1136,6 @@ ApplyPatch linux-2.6-execshield.patch
 # btrfs
 #ApplyPatch linux-2.6-btrfs-experimental-branch.patch
 
-ApplyPatch linux-2.6-net-velocity-pktlen.patch
-
 # USB
 
 # ACPI
@@ -1846,6 +1842,12 @@ fi
 # and build.
 
 %changelog
+* Wed Jun 24 2009 Dave Jones <davej at redhat.com> 2.6.31-0.22.rc0.git22
+- 2.6.30-git22
+
+* Tue Jun 23 2009 Dave Jones <davej at redhat.com> 2.6.31-0.22.rc0.git20
+- 2.6.30-git20
+
 * Mon Jun 22 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.24.rc0.git18
 - Enable tools/perf, installed as /bin/perf-$KernelVer. Docs and a /bin/perf
   wrapper come next if this builds ok.

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.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- linux-2.6-defaults-pci_no_msi.patch	20 Apr 2009 17:43:27 -0000	1.5
+++ linux-2.6-defaults-pci_no_msi.patch	24 Jun 2009 18:37:56 -0000	1.6
@@ -1,9 +1,9 @@
---- 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] Disable use of MMCONFIG for PCI
- 				Configuration
+--- linux-2.6.30.noarch/Documentation/kernel-parameters.txt~	2009-06-24 14:25:04.000000000 -0400
++++ linux-2.6.30.noarch/Documentation/kernel-parameters.txt	2009-06-24 14:25:32.000000000 -0400
+@@ -1811,6 +1811,9 @@ and is between 256 and 4096 characters. 
+ 		check_enable_amd_mmconf [X86] check for and enable
+ 				properly configured MMIO access to PCI
+ 				config space on AMD family 10h CPU
 +		msi		[MSI] If the PCI_MSI kernel config parameter is
 +				enabled, this kernel boot option can be used to
 +				enable the use of MSI interrupts system-wide.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1042
retrieving revision 1.1043
diff -u -p -r1.1042 -r1.1043
--- sources	22 Jun 2009 00:41:22 -0000	1.1042
+++ sources	24 Jun 2009 18:37:56 -0000	1.1043
@@ -1,2 +1,2 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
-6b3711ba46882f5de414f21467421e50  patch-2.6.30-git18.bz2
+37c20c3950ab93fa419a38245d8e64aa  patch-2.6.30-git22.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.956
retrieving revision 1.957
diff -u -p -r1.956 -r1.957
--- upstream	22 Jun 2009 00:41:23 -0000	1.956
+++ upstream	24 Jun 2009 18:37:56 -0000	1.957
@@ -1,2 +1,2 @@
 linux-2.6.30.tar.bz2
-patch-2.6.30-git18.bz2
+patch-2.6.30-git22.bz2


--- linux-2.6-net-velocity-pktlen.patch DELETED ---


--- patch-2.6.30-git18.bz2.sign DELETED ---


