rpms/kernel/devel kernel-2.6.spec, 1.2068, 1.2069 upstream, 1.301, 1.302 linux-2.6-net-ipw2200-hwcrypto.patch, 1.1, NONE linux-2.6-net-wireless-features.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19070

Modified Files:
	kernel-2.6.spec upstream 
Removed Files:
	linux-2.6-net-ipw2200-hwcrypto.patch 
	linux-2.6-net-wireless-features.patch 
Log Message:
git1 - 179 diffs already.   (oh yes, there will be blood)




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2068
retrieving revision 1.2069
diff -u -r1.2068 -r1.2069
--- kernel-2.6.spec	20 Mar 2006 19:57:02 -0000	1.2068
+++ kernel-2.6.spec	20 Mar 2006 22:08:08 -0000	1.2069
@@ -217,6 +217,7 @@
 #
 # Patches 0 through 100 are meant for core subsystem upgrades
 #
+Patch1: patch-2.6.16-git1.bz2
 
 # Patches 100 through 500 are meant for architecture patches
 Patch100: linux-2.6-bzimage.patch
@@ -339,8 +340,6 @@
 
 # NIC driver updates
 Patch1301: linux-2.6-net-sundance-ip100A.patch
-Patch1302: linux-2.6-net-wireless-features.patch
-Patch1303: linux-2.6-net-ipw2200-hwcrypto.patch
 Patch1304: linux-2.6-net-ipw2200-monitor.patch
 
 # Squashfs
@@ -714,6 +713,7 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
+%patch1 -p1
 
 #
 # Patches 10 through 100 are meant for core subsystem upgrades
@@ -938,10 +938,6 @@
 # NIC driver fixes.
 # New PCI ID for sundance driver.
 %patch1301 -p1
-# Goodies for wireless drivers to make NetworkManager work
-%patch1302 -p1
-# ipw2200 hwcrypto=0 by default to avoid firmware restarts
-%patch1303 -p1
 # add IPW2200_MONITOR config option
 %patch1304 -p1
 
@@ -1046,11 +1042,11 @@
 #
 
 # Import softmac code from wireless-2.6 tree
-%patch5000 -p1
+#%patch5000 -p1
 # ... and bcm43xx driver too
-%patch5001 -p1
+#%patch5001 -p1
 # temporarily remove bcm43xx's MODULE_DEVICE_TABLE entry
-%patch5002 -p1
+#%patch5002 -p1
 
 #
 # final stuff
@@ -1654,7 +1650,7 @@
 
 %changelog
 * Mon Mar 20 2006 Dave Jones <davej at redhat.com>
-- 2.6.16
+- 2.6.16 & 2.6.16-git1
 
 * Sun Mar 19 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc6-git12


Index: upstream
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/upstream,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- upstream	20 Mar 2006 06:53:48 -0000	1.301
+++ upstream	20 Mar 2006 22:08:10 -0000	1.302
@@ -1 +1,2 @@
 linux-2.6.16.tar.bz2
+patch-2.6.16-git1.bz2


--- linux-2.6-net-ipw2200-hwcrypto.patch DELETED ---


--- linux-2.6-net-wireless-features.patch DELETED ---