rpms/kernel/devel patch-2.6.22-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.651, 1.652 config-generic, 1.4, 1.5 kernel.spec, 1.9, 1.10 sources, 1.615, 1.616 upstream, 1.537, 1.538 patch-2.6.22-git5.bz2.sign, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28658

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.22-git6.bz2.sign 
Removed Files:
	patch-2.6.22-git5.bz2.sign 
Log Message:
* Mon Jul 16 2007 Dave Jones <davej at redhat.com>
- 2.6.22-git6



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

iD8DBQBGmxgvyGugalF9Dw4RAlVaAJ4sfVV3FHVykTipeZo5yv0ceKy2ygCfWXXH
B74enrvovq9oKQyUGIYXHJU=
=THUo
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.651
retrieving revision 1.652
diff -u -r1.651 -r1.652
--- .cvsignore	14 Jul 2007 18:53:58 -0000	1.651
+++ .cvsignore	16 Jul 2007 13:53:58 -0000	1.652
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22-git5.bz2
+patch-2.6.22-git6.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config-generic	13 Jul 2007 19:58:04 -0000	1.4
+++ config-generic	16 Jul 2007 13:53:58 -0000	1.5
@@ -711,6 +711,10 @@
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_SUBTREES=y
 CONFIG_IPV6_MULTIPLE_TABLES=y
+
+CONFIG_NET_9P=m
+# CONFIG_NET_9P_DEBUG is not set
+
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
 # CONFIG_DECNET_NF_GRABULATOR is not set
@@ -734,6 +738,7 @@
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
@@ -785,7 +790,7 @@
 CONFIG_NF_NAT_SNMP_BASIC=m
 CONFIG_NF_CT_PROTO_SCTP=m
 CONFIG_NF_CT_NETLINK=m
-
+CONFIG_NF_CT_PROTO_UDPLITE=m
 
 CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
@@ -978,6 +983,7 @@
 CONFIG_IFB=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
+CONFIG_MACVLAN=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_NET_SB1000=m
@@ -3188,4 +3194,3 @@
 CONFIG_BATTERY_PMU=m
 # CONFIG_PDA_POWER is not set
 
-


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kernel.spec	15 Jul 2007 20:18:23 -0000	1.9
+++ kernel.spec	16 Jul 2007 13:53:58 -0000	1.10
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1104,7 +1104,7 @@
 # Temporary hack to work around GCC PR #25724 / #21237
 ApplyPatch linux-2.6-ppc32-ucmpdi2.patch
 # Fix up ibmvscsi for combined pSeries/iSeries build
-ApplyPatch linux-2.6-ibmvscsi-schizo.patch
+#ApplyPatch linux-2.6-ibmvscsi-schizo.patch
 # Move pmac_zilog to its newly-registered device number
 ApplyPatch linux-2.6-pmac-zilog.patch
 
@@ -2159,6 +2159,9 @@
 %endif
 
 %changelog
+* Mon Jul 16 2007 Dave Jones <davej at redhat.com>
+- 2.6.22-git6
+
 * Sun Jul 15 2007 Dave Jones <davej at redhat.com>
 - 2.6.22-git5
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.615
retrieving revision 1.616
diff -u -r1.615 -r1.616
--- sources	14 Jul 2007 18:53:58 -0000	1.615
+++ sources	16 Jul 2007 13:53:58 -0000	1.616
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-00f7a86ab54be8e9ac162a3ceaf34a7c  patch-2.6.22-git5.bz2
+1fa6a7235ea9513f17216230026bd358  patch-2.6.22-git6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- upstream	14 Jul 2007 18:53:58 -0000	1.537
+++ upstream	16 Jul 2007 13:53:58 -0000	1.538
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22-git5.bz2
+patch-2.6.22-git6.bz2


--- patch-2.6.22-git5.bz2.sign DELETED ---