rpms/kernel/devel patch-2.6.24-rc3-git7.bz2.sign, NONE, 1.1 .cvsignore, 1.724, 1.725 kernel.spec, 1.274, 1.275 linux-2.6-fec_mpc52xx-fix.patch, 1.3, 1.4 sources, 1.684, 1.685 upstream, 1.606, 1.607 linux-2.6-phy-ioctl-fix.patch, 1.1, NONE patch-2.6.24-rc3-git6.bz2.sign, 1.1, NONE

[Kyle McMartin (kyle)]

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec linux-2.6-fec_mpc52xx-fix.patch sources 
	upstream 
Added Files:
	patch-2.6.24-rc3-git7.bz2.sign 
Removed Files:
	linux-2.6-phy-ioctl-fix.patch patch-2.6.24-rc3-git6.bz2.sign 
Log Message:
* Mon Dec 03 2007 Kyle McMartin <kmcmartin at redhat.com>
- 2.6.24-rc3-git7
- turn off linux-2.6-wireless.patch, merged into -git7
- remove linux-2.6-phy-ioctl-fix.patch, merged into -git7
- remove SET_NETDEV hunk in linux-2.6-fec_mpc52xx-fix.patch, merged in -git7



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

iD8DBQBHVFKsyGugalF9Dw4RAvyUAKCHgat5VpwJ/WtlmWE+RNCZXgzg+QCdELiN
zIaNHT2ub6Q715+fh8wQvaI=
=KbDJ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.724
retrieving revision 1.725
diff -u -r1.724 -r1.725
--- .cvsignore	2 Dec 2007 02:59:29 -0000	1.724
+++ .cvsignore	3 Dec 2007 20:22:53 -0000	1.725
@@ -5,3 +5,4 @@
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc3.bz2
 patch-2.6.24-rc3-git6.bz2
+patch-2.6.24-rc3-git7.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- kernel.spec	3 Dec 2007 18:34:36 -0000	1.274
+++ kernel.spec	3 Dec 2007 20:22:53 -0000	1.275
@@ -47,7 +47,7 @@
 # The rc snapshot level
 %define rcrev 3
 # The git snapshot level
-%define gitrev 6
+%define gitrev 7
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -607,7 +607,7 @@
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
 Patch670: linux-2.6-ata-quirk.patch
-Patch680: linux-2.6-wireless.patch
+#Patch680: linux-2.6-wireless.patch
 Patch681: linux-2.6-wireless-pending.patch
 Patch690: linux-2.6-at76.patch
 Patch691: linux-2.6-ath5k.patch
@@ -632,7 +632,6 @@
 Patch1516: linux-2.6-firewire-ohci-1.0-iso-receive.patch
 Patch1520: linux-2.6-dcdbas-autoload.patch
 Patch1540: linux-2.6-fec_mpc52xx-fix.patch
-Patch1550: linux-2.6-phy-ioctl-fix.patch
 
 # drm-mm catchup (modesetting, ...)
 Patch1801: linux-2.6-drm-mm.patch
@@ -1102,7 +1101,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.24
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.25
 ApplyPatch linux-2.6-wireless-pending.patch
 
@@ -1153,9 +1152,6 @@
 # Fix fec_mpc52xx not to corrupt memory
 ApplyPatch linux-2.6-fec_mpc52xx-fix.patch
 
-# Fix generic PHY code not to pretend to be wireless
-ApplyPatch linux-2.6-phy-ioctl-fix.patch
-
 ApplyPatch linux-2.6-e1000-corrupt-eeprom-checksum.patch
 
 # drm-mm catchup (modesetting, ...)
@@ -1721,6 +1717,12 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Dec 03 2007 Kyle McMartin <kmcmartin at redhat.com>
+- 2.6.24-rc3-git7
+- turn off linux-2.6-wireless.patch, merged into -git7
+- remove linux-2.6-phy-ioctl-fix.patch, merged into -git7
+- remove SET_NETDEV hunk in linux-2.6-fec_mpc52xx-fix.patch, merged in -git7
+
 * Mon Dec 03 2007 Jarod Wilson <jwilson at redhat.com>
 - Fix regression on FireWire OHCI 1.1 controllers introduced
   by 1.0 support (#344851)

linux-2.6-fec_mpc52xx-fix.patch:

Index: linux-2.6-fec_mpc52xx-fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-fec_mpc52xx-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-fec_mpc52xx-fix.patch	28 Nov 2007 18:00:29 -0000	1.3
+++ linux-2.6-fec_mpc52xx-fix.patch	3 Dec 2007 20:22:53 -0000	1.4
@@ -83,12 +83,3 @@
  				FEC_RX_BUFFER_SIZE, DMA_FROM_DEVICE);
 
  		bcom_submit_next_buffer(priv->rx_dmatsk, skb);
-@@ -971,6 +971,8 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
- 
- 	mpc52xx_fec_reset_stats(ndev);
- 
-+	SET_NETDEV_DEV(ndev, &op->dev);
-+
- 	/* Register the new network device */
- 	rv = register_netdev(ndev);
- 	if (rv < 0)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- sources	2 Dec 2007 02:59:29 -0000	1.684
+++ sources	3 Dec 2007 20:22:53 -0000	1.685
@@ -1,3 +1,3 @@
 2cc2fd4d521dc5d7cfce0d8a9d1b3472  linux-2.6.23.tar.bz2
 b9a66b38fdfa600112f0c6172440a179  patch-2.6.24-rc3.bz2
-506feb779050e8785a0aa24535d767a2  patch-2.6.24-rc3-git6.bz2
+a25a70e73ba2fec93b39d7761dd551e3  patch-2.6.24-rc3-git7.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -r1.606 -r1.607
--- upstream	2 Dec 2007 02:59:29 -0000	1.606
+++ upstream	3 Dec 2007 20:22:53 -0000	1.607
@@ -1,3 +1,3 @@
 linux-2.6.23.tar.bz2
 patch-2.6.24-rc3.bz2
-patch-2.6.24-rc3-git6.bz2
+patch-2.6.24-rc3-git7.bz2


--- linux-2.6-phy-ioctl-fix.patch DELETED ---


--- patch-2.6.24-rc3-git6.bz2.sign DELETED ---