rpms/kernel/F-9 kernel.spec, 1.733, 1.734 linux-2.6-ps3-legacy-bootloader-hack.patch, 1.1, 1.2 linux-2.6-efika-not-chrp.patch, 1.1, NONE linux-2.6-ms-wireless-receiver.patch, 1.2, NONE

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27274

Modified Files:
	kernel.spec linux-2.6-ps3-legacy-bootloader-hack.patch 
Removed Files:
	linux-2.6-efika-not-chrp.patch 
	linux-2.6-ms-wireless-receiver.patch 
Log Message:
Drop already-merged patches, fix up PS3 bootloader patch.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.733
retrieving revision 1.734
diff -u -r1.733 -r1.734
--- kernel.spec	5 Aug 2008 03:18:03 -0000	1.733
+++ kernel.spec	5 Aug 2008 04:50:38 -0000	1.734
@@ -587,7 +587,6 @@
 Patch144: linux-2.6-vio-modalias.patch
 Patch147: linux-2.6-imac-transparent-bridge.patch
 Patch148: linux-2.6-powerpc-zImage-32MiB.patch
-Patch149: linux-2.6-efika-not-chrp.patch
 Patch150: linux-2.6-fbdev-teach-offb-about-palette-on-radeon-r500-r600.patch
 Patch151: linux-2.6-powerpc-fix-OF-parsing-of-64-bits-pci-addresses.patch
 
@@ -650,8 +649,6 @@
 
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# Fix HID usage descriptor on MS wireless desktop receiver
-Patch2301: linux-2.6-ms-wireless-receiver.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=454028
 Patch2302: linux-2.6-usb-storage-nikond80-quirk.patch
 
@@ -1021,18 +1018,14 @@
 ###  UPSTREAM PATCHES:
 ### NOT (YET) UPSTREAM:
 # The EHCI ISO patch isn't yet upstream but is needed to fix reboot
-# FIXME: remove?? (does not apply)
+# FIXME: needs work
 #ApplyPatch linux-2.6-ps3-ehci-iso.patch
-# Fixes some wireless optical mice
-# FIXME: remove?? (does not apply)
-#ApplyPatch linux-2.6-ms-wireless-receiver.patch
 # The storage alias patch is Fedora-local, and allows the old 'ps3_storage'
 # module name to work on upgrades. Otherwise, I believe mkinitrd will fail
 # to pull the module in,
 ApplyPatch linux-2.6-ps3-storage-alias.patch
 # Support booting from Sony's original released 2.6.16-based kboot
-# FIXME: remove?? (does not apply)
-#ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
+ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
 # Alleviate G5 thermal shutdown problems
 ApplyPatch linux-2.6-g5-therm-shutdown.patch
 # Provide modalias in sysfs for vio devices
@@ -1041,9 +1034,6 @@
 ApplyPatch linux-2.6-imac-transparent-bridge.patch
 # Link zImage at 32MiB (for POWER machines, Efika)
 ApplyPatch linux-2.6-powerpc-zImage-32MiB.patch
-# Don't show 'CHRP' in /proc/cpuinfo on Efika
-# FIXME: remove?? (does not apply)
-#ApplyPatch linux-2.6-efika-not-chrp.patch
 # fixes for quad PPC 970 powerstation (#457467)
 ApplyPatch linux-2.6-fbdev-teach-offb-about-palette-on-radeon-r500-r600.patch
 ApplyPatch linux-2.6-powerpc-fix-OF-parsing-of-64-bits-pci-addresses.patch
@@ -1782,10 +1772,13 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
-* Tue Aug 05 2008 Dave Airlie <airlied at redhat.com> 2.6.26.1-5
+* Tue Aug 05 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.1-7
+- Drop already-merged patches, fix up PS3 bootloader patch.
+
+* Tue Aug 05 2008 Dave Airlie <airlied at redhat.com> 2.6.26.1-6
 - rebase drm into 2.6.26 in one super patch
 
-* Mon Aug 04 2008 Dave Jones <davej at redhat.com>
+* Mon Aug 04 2008 Dave Jones <davej at redhat.com> 2.6.26.1-5
 - Fix bogus printk in execshield noticed by Brendan Lynch.
 
 * Mon Aug 04 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.1-4
@@ -1795,7 +1788,6 @@
 * Mon Aug 04 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.1-3
 - Fix up the smarter-relatime patch.
 
->>>>>>> 1.732
 * Mon Aug 04 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.1-2
 - Fixes for quad PPC970 Powerstation (#457467)
 

linux-2.6-ps3-legacy-bootloader-hack.patch:

Index: linux-2.6-ps3-legacy-bootloader-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-ps3-legacy-bootloader-hack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-ps3-legacy-bootloader-hack.patch	31 Jul 2007 11:33:24 -0000	1.1
+++ linux-2.6-ps3-legacy-bootloader-hack.patch	5 Aug 2008 04:50:38 -0000	1.2
@@ -20,8 +20,8 @@
 +	}
 +#endif
  		lmb_add(base, size);
- 	}
- 	return 0;
+ 
+ 		memstart_addr = min((u64)memstart_addr, base);
 --- a/arch/powerpc/platforms/ps3/setup.c
 +++ b/arch/powerpc/platforms/ps3/setup.c
 @@ -210,7 +210,9 @@ static int __init ps3_probe(void)


--- linux-2.6-efika-not-chrp.patch DELETED ---


--- linux-2.6-ms-wireless-receiver.patch DELETED ---