Tue Oct 7 22:07:47 UTC 2008

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14804

Modified Files:
	.cvsignore kernel.spec linux-2.6-upstream-reverts.patch 
	sources upstream 
Added Files:
	patch-2.6.26.6-rc1.bz2.sign 
Removed Files:
	linux-2.6-acpi-processor-use-signed-int.patch 
	linux-2.6-block-submit_bh-discards-barrier-flag.patch 
	linux-2.6-mm-dirty-page-tracking-race-fix.patch 
	linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch 
	linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch 
	linux-2.6-sched-fix-process-time-monotonicity.patch 
	linux-2.6-usb-fix-hcd-interrupt-disabling.patch 
	linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch 
	linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch 
	linux-2.6-x86-fdiv-bug-detection-fix.patch 
	linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch 
	linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch 
	linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch 
	linux-2.6-x86-hpet-02-read-back-compare-register.patch 
	linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch 
	linux-2.6-x86-io-delay-add-hp-f700-quirk.patch 
	linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch 
Log Message:
2.6.26.6-rc1

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

iD8DBQBI6uyYyGugalF9Dw4RAm1HAJsF9YfvQo9Qm0uMjaACIfeiSuWzjwCeJrfz
bDv1gLr72tEvMTglblxOriM=
=pqVn
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- .cvsignore	8 Sep 2008 18:52:11 -0000	1.826
+++ .cvsignore	7 Oct 2008 22:07:16 -0000	1.827
@@ -5,3 +5,4 @@
 kernel-2.6.26
 linux-2.6.26.tar.bz2
 patch-2.6.26.5.bz2
+patch-2.6.26.6-rc1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -r1.782 -r1.783
--- kernel.spec	6 Oct 2008 15:26:31 -0000	1.782
+++ kernel.spec	7 Oct 2008 22:07:16 -0000	1.783
@@ -32,16 +32,16 @@
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
 # Is it a -stable RC?
-%define stable_rc 0
+%define stable_rc 1
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
 %define stable_base %{stable_update}
 %if 0%{?stable_rc}
 # stable RCs are incremental patches, so we need the previous stable patch
-%define stable_base %(expr %{stable_base} - 1)
+%define stable_base %(expr %{stable_update} - 1)
 %endif
 %endif
 %define rpmversion 2.6.%{base_sublevel}%{?stablerev}
@@ -597,22 +597,11 @@
 
 Patch41: linux-2.6-sysrq-c.patch
 Patch42: linux-2.6-sched-clock-fix-nohz-interaction.patch
-Patch43: linux-2.6-sched-fix-process-time-monotonicity.patch
 
 Patch70: linux-2.6-x86-tune-generic.patch
 Patch75: linux-2.6-x86-debug-boot.patch
 Patch87: linux-2.6-x86-apic-dump-all-regs-v3.patch
-Patch88: linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
-Patch89: linux-2.6-x86-fdiv-bug-detection-fix.patch
-Patch90: linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
-Patch91: linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
-Patch92: linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
-Patch93: linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
-Patch94: linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
-Patch95: linux-2.6-x86-hpet-02-read-back-compare-register.patch
-Patch96: linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 Patch97: linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
-Patch98: linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 Patch100: linux-2.6-x86-pci-detect-end_bus_number.patch
 Patch101: linux-2.6-x86-check-for-null-irq-context.patch
 Patch102: linux-2.6-x86-cpu-hotplug-allow-setting-additional-cpus.patch
@@ -644,7 +633,6 @@
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch402: linux-2.6-scsi-mpt-vmware-fix.patch
 
-Patch412: linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # filesystem patches
 Patch420: linux-2.6-fs-cifs-turn-off-unicode-during-session-establishment.patch
@@ -683,13 +671,11 @@
 
 Patch700: linux-2.6-nfs-client-mounts-hang.patch
 
-Patch800: linux-2.6-acpi-processor-use-signed-int.patch
 Patch810: linux-2.6-cpuidle-1-do-not-use-poll_idle-unless-user-asks-for-it.patch
 Patch820: linux-2.6-cpuidle-2-menu-governor-fix-wrong-usage-of-measured_us.patch
 Patch830: linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 
-Patch900: linux-2.6-mm-dirty-page-tracking-race-fix.patch
-Patch901: linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
+#mm
 
 Patch1101: linux-2.6-default-mmf_dump_elf_headers.patch
 Patch1400: linux-2.6-smarter-relatime.patch
@@ -715,7 +701,6 @@
 
 # make USB EHCI driver respect "nousb" parameter
 Patch2300: linux-2.6-usb-ehci-hcd-respect-nousb.patch
-Patch2301: linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 Patch2501: linux-2.6-ppc-use-libgcc.patch
 
@@ -724,7 +709,6 @@
 
 Patch2700: linux-2.6-intel-msr-backport.patch
 Patch2701: linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
-Patch2703: linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
 
 # for kerneloops reports
 Patch2800: linux-2.6-net-print-module-name-as-part-of-the-message.patch
@@ -1078,7 +1062,6 @@
 
 # fix sched clock monotonicity bugs
 ApplyPatch linux-2.6-sched-clock-fix-nohz-interaction.patch
-ApplyPatch linux-2.6-sched-fix-process-time-monotonicity.patch
 
 # Architecture patches
 # x86(-64)
@@ -1086,25 +1069,8 @@
 ApplyPatch linux-2.6-x86-tune-generic.patch
 # dump *PIC state at boot with apic=debug
 ApplyPatch linux-2.6-x86-apic-dump-all-regs-v3.patch
-#
-ApplyPatch linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
-# x86 f00f bug not handled properly (#197455)
-ApplyPatch linux-2.6-x86-fdiv-bug-detection-fix.patch
-# another machine needing io_delay=0xed
-ApplyPatch linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
-# oprofile / hibernation fix
-ApplyPatch linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
-#
-ApplyPatch linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
-#
-ApplyPatch linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
 # hpet fixes from 2.6.27
-ApplyPatch linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
-ApplyPatch linux-2.6-x86-hpet-02-read-back-compare-register.patch
-ApplyPatch linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
 ApplyPatch linux-2.6-x86-hpet-04-workaround-sb700-bios.patch
-# fix memmap=exactmap, so kdump kernels work
-ApplyPatch linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
 # fix e820 reservation checking
 ApplyPatch linux-2.6-x86-pci-detect-end_bus_number.patch
 # don't oops if there's no IRQ stack available
@@ -1159,22 +1125,14 @@
 # USB
 # actually honor the nousb parameter
 ApplyPatch linux-2.6-usb-ehci-hcd-respect-nousb.patch
-# fix USB on the PS3
-ApplyPatch linux-2.6-usb-fix-hcd-interrupt-disabling.patch
 
 # ACPI
-# obvious bug in processor driver
-ApplyPatch linux-2.6-acpi-processor-use-signed-int.patch
 # fix cpuidle misbehavior
 ApplyPatch linux-2.6-cpuidle-1-do-not-use-poll_idle-unless-user-asks-for-it.patch
 ApplyPatch linux-2.6-cpuidle-2-menu-governor-fix-wrong-usage-of-measured_us.patch
 ApplyPatch linux-2.6-cpuidle-3-make-ladder-governor-honor-latency-requirements.patch
 
 # mm
-# possible data corruption, esp. on ppc
-ApplyPatch linux-2.6-mm-dirty-page-tracking-race-fix.patch
-# mm zone scan patch scheduled for -stable
-ApplyPatch linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
 
 # Various low-impact patches to aid debugging.
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
@@ -1210,8 +1168,6 @@
 
 # block/bio
 #
-# don't discard barrier flags
-ApplyPatch linux-2.6-block-submit_bh-discards-barrier-flag.patch
 
 # Filesystem patches.
 # cifs
@@ -1331,8 +1287,6 @@
 
 ApplyPatch linux-2.6-intel-msr-backport.patch
 ApplyPatch linux-2.6-libata-sff-kill-spurious-WARN_ON-in-ata_hsm_move.patch
-# fix subtle but annoying PCMCIA bug
-ApplyPatch linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
 
 # for kerneloops reports
 ApplyPatch linux-2.6-net-print-module-name-as-part-of-the-message.patch
@@ -1929,6 +1883,27 @@
 %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 Oct 07 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.6-56.rc1
+- 2.6.26.6-rc1
+  Dropped patches:
+    linux-2.6-sched-fix-process-time-monotonicity.patch
+    linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch
+    linux-2.6-x86-fdiv-bug-detection-fix.patch
+    linux-2.6-x86-io-delay-add-hp-f700-quirk.patch
+    linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch
+    linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch
+    linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch
+    linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch
+    linux-2.6-x86-hpet-02-read-back-compare-register.patch
+    linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch
+    linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch
+    linux-2.6-usb-fix-hcd-interrupt-disabling.patch
+    linux-2.6-acpi-processor-use-signed-int.patch
+    linux-2.6-mm-dirty-page-tracking-race-fix.patch
+    linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch
+    linux-2.6-block-submit_bh-discards-barrier-flag.patch
+    linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch
+
 * Mon Oct 06 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-55
 - Fix more fallout from the WARN() macro.
 

linux-2.6-upstream-reverts.patch:

Index: linux-2.6-upstream-reverts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-upstream-reverts.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- linux-2.6-upstream-reverts.patch	22 Aug 2008 18:16:26 -0000	1.10
+++ linux-2.6-upstream-reverts.patch	7 Oct 2008 22:07:16 -0000	1.11
@@ -180,3 +180,118 @@
  
  	/* rtl8187 specific */
  	struct ieee80211_channel channels[14];
+From 8e260c22238dd8b57aefb1f5e4bd114486a9c17d Mon Sep 17 00:00:00 2001
+From: Ivo van Doorn <ivdoorn at gmail.com>
+Date: Fri, 4 Jul 2008 13:41:31 +0200
+Subject: rt2x00: Use ieee80211_hw->workqueue again
+
+From: Ivo van Doorn <ivdoorn at gmail.com>
+
+commit 8e260c22238dd8b57aefb1f5e4bd114486a9c17d upstream
+
+Remove the rt2x00 singlethreaded workqueue and move
+the link tuner and packet filter scheduled work to
+the ieee80211_hw->workqueue again.
+The only exception is the interface scheduled work
+handler which uses the mac80211 interface iterator
+under the RTNL lock. This work needs to be handled
+on the kernel workqueue to prevent lockdep issues.
+
+Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/net/wireless/rt2x00/rt2x00.h    |    4 +++-
+ drivers/net/wireless/rt2x00/rt2x00dev.c |   17 +++--------------
+ drivers/net/wireless/rt2x00/rt2x00mac.c |    4 ++--
+ 3 files changed, 8 insertions(+), 17 deletions(-)
+
+--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
+@@ -75,7 +75,7 @@ static void rt2x00lib_start_link_tuner(s
+ 
+ 	rt2x00lib_reset_link_tuner(rt2x00dev);
+ 
+-	queue_delayed_work(rt2x00dev->workqueue,
++	queue_delayed_work(rt2x00dev->hw->workqueue,
+ 			   &rt2x00dev->link.work, LINK_TUNE_INTERVAL);
+ }
+ 
+@@ -390,7 +390,7 @@ static void rt2x00lib_link_tuner(struct 
+ 	 * Increase tuner counter, and reschedule the next link tuner run.
+ 	 */
+ 	rt2x00dev->link.count++;
+-	queue_delayed_work(rt2x00dev->workqueue,
++	queue_delayed_work(rt2x00dev->hw->workqueue,
+ 			   &rt2x00dev->link.work, LINK_TUNE_INTERVAL);
+ }
+ 
+@@ -488,7 +488,7 @@ void rt2x00lib_beacondone(struct rt2x00_
+ 						   rt2x00lib_beacondone_iter,
+ 						   rt2x00dev);
+ 
+-	queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work);
++	schedule_work(&rt2x00dev->intf_work);
+ }
+ EXPORT_SYMBOL_GPL(rt2x00lib_beacondone);
+ 
+@@ -1131,10 +1131,6 @@ int rt2x00lib_probe_dev(struct rt2x00_de
+ 	/*
+ 	 * Initialize configuration work.
+ 	 */
+-	rt2x00dev->workqueue = create_singlethread_workqueue("rt2x00lib");
+-	if (!rt2x00dev->workqueue)
+-		goto exit;
+-
+ 	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
+ 	INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled);
+ 	INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner);
+@@ -1195,13 +1191,6 @@ void rt2x00lib_remove_dev(struct rt2x00_
+ 	rt2x00leds_unregister(rt2x00dev);
+ 
+ 	/*
+-	 * Stop all queued work. Note that most tasks will already be halted
+-	 * during rt2x00lib_disable_radio() and rt2x00lib_uninitialize().
+-	 */
+-	flush_workqueue(rt2x00dev->workqueue);
+-	destroy_workqueue(rt2x00dev->workqueue);
+-
+-	/*
+ 	 * Free ieee80211_hw memory.
+ 	 */
+ 	rt2x00lib_remove_hw(rt2x00dev);
+--- a/drivers/net/wireless/rt2x00/rt2x00.h
++++ b/drivers/net/wireless/rt2x00/rt2x00.h
+@@ -820,8 +820,10 @@ struct rt2x00_dev {
+ 
+ 	/*
+ 	 * Scheduled work.
++	 * NOTE: intf_work will use ieee80211_iterate_active_interfaces()
++	 * which means it cannot be placed on the hw->workqueue
++	 * due to RTNL locking requirements.
+ 	 */
+-	struct workqueue_struct *workqueue;
+ 	struct work_struct intf_work;
+ 	struct work_struct filter_work;
+ 
+--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
+@@ -428,7 +428,7 @@ void rt2x00mac_configure_filter(struct i
+ 	if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))
+ 		rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
+ 	else
+-		queue_work(rt2x00dev->workqueue, &rt2x00dev->filter_work);
++		queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->filter_work);
+ }
+ EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);
+ 
+@@ -509,7 +509,7 @@ void rt2x00mac_bss_info_changed(struct i
+ 	memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
+ 	if (delayed) {
+ 		intf->delayed_flags |= delayed;
+-		queue_work(rt2x00dev->workqueue, &rt2x00dev->intf_work);
++		schedule_work(&rt2x00dev->intf_work);
+ 	}
+ 	spin_unlock(&intf->lock);
+ }


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- sources	8 Sep 2008 18:52:12 -0000	1.787
+++ sources	7 Oct 2008 22:07:16 -0000	1.788
@@ -1,2 +1,3 @@
 5169d01c405bc3f866c59338e217968c  linux-2.6.26.tar.bz2
 2bceb4747e65394d34066f3db778fd0f  patch-2.6.26.5.bz2
+c09de4c6d64408103f6c15e201afa5be  patch-2.6.26.6-rc1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.706
retrieving revision 1.707
diff -u -r1.706 -r1.707
--- upstream	8 Sep 2008 18:52:12 -0000	1.706
+++ upstream	7 Oct 2008 22:07:16 -0000	1.707
@@ -1,2 +1,3 @@
 linux-2.6.26.tar.bz2
 patch-2.6.26.5.bz2
+patch-2.6.26.6-rc1.bz2


--- linux-2.6-acpi-processor-use-signed-int.patch DELETED ---


--- linux-2.6-block-submit_bh-discards-barrier-flag.patch DELETED ---


--- linux-2.6-mm-dirty-page-tracking-race-fix.patch DELETED ---


--- linux-2.6-mm-mark-correct-zone-full-when-scanning-zonelists.patch DELETED ---


--- linux-2.6-pcmcia-fix-broken-abuse-of-dev-driver_data.patch DELETED ---


--- linux-2.6-sched-fix-process-time-monotonicity.patch DELETED ---


--- linux-2.6-usb-fix-hcd-interrupt-disabling.patch DELETED ---


--- linux-2.6-x86-32-amd-c1e-force-timer-broadcast-late.patch DELETED ---


--- linux-2.6-x86-64-fix-overlap-of-modules-and-fixmap-areas.patch DELETED ---


--- linux-2.6-x86-fdiv-bug-detection-fix.patch DELETED ---


--- linux-2.6-x86-fix-memmap-exactmap-boot-argument.patch DELETED ---


--- linux-2.6-x86-fix-oprofile-and-hibernation-issues.patch DELETED ---


--- linux-2.6-x86-hpet-01-fix-moronic-32-64-bit-thinko.patch DELETED ---


--- linux-2.6-x86-hpet-02-read-back-compare-register.patch DELETED ---


--- linux-2.6-x86-hpet-03-make-minimum-reprogramming-delta-useful.patch DELETED ---


--- linux-2.6-x86-io-delay-add-hp-f700-quirk.patch DELETED ---


--- linux-2.6-x86-pat-proper-tracking-of-set_memory_uc.patch DELETED ---


