Mon Jun 9 20:25:38 UTC 2008

Author: cebbert

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

Modified Files:
	.cvsignore kernel.spec 
	linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch 
	sources upstream 
Added Files:
	patch-2.6.25.6.bz2.sign 
Removed Files:
	linux-2.6-caps-remain-source-compatible-with-32-bit.patch 
	linux-2.6-cifs-fix-unc-path-prefix.patch 
	linux-2.6-ext34-xattr-fix.patch 
	linux-2.6-libata-force-hardreset-in-sleep-mode.patch 
	linux-2.6-net-iptables-add-xt_iprange-aliases.patch 
	linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch 
	linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch 
	linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch 
	linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch 
	linux-2.6-x86-prevent-pge-flush-from-interruption.patch 
	linux-2.6-xfs-small-buffer-reads.patch patch-2.6.25.5.bz2.sign 
Log Message:
* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-50
- Linux 2.6.25.6
- Dropped patches:
    linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
    linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
    linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
    linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch
    linux-2.6-x86-prevent-pge-flush-from-interruption.patch
    linux-2.6-cifs-fix-unc-path-prefix.patch
    linux-2.6-ext34-xattr-fix.patch
    linux-2.6-xfs-small-buffer-reads.patch
    linux-2.6-net-iptables-add-xt_iprange-aliases.patch
    linux-2.6-caps-remain-source-compatible-with-32-bit.patch
    linux-2.6-libata-force-hardreset-in-sleep-mode.patch
- Updated patches:
    linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch

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

iD8DBQBITYdsyGugalF9Dw4RAh0lAJ45RSJW2uBYJUVBttNqUIhiSrJv2wCaAtJ5
NQlHOvr4oPuE64NNR1rPpKI=
=Qh8s
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/.cvsignore,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- .cvsignore	7 Jun 2008 03:24:19 -0000	1.813
+++ .cvsignore	9 Jun 2008 20:24:45 -0000	1.814
@@ -4,4 +4,4 @@
 temp-*
 kernel-2.6.25
 linux-2.6.25.tar.bz2
-patch-2.6.25.5.bz2
+patch-2.6.25.6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.668
retrieving revision 1.669
diff -u -r1.668 -r1.669
--- kernel.spec	7 Jun 2008 03:53:10 -0000	1.668
+++ kernel.spec	9 Jun 2008 20:24:45 -0000	1.669
@@ -31,7 +31,7 @@
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
 # Do we have a 2.6.21.y update to apply?
-%define stable_update 5
+%define stable_update 6
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -554,7 +554,7 @@
 %endif
 
 # stable release candidate
-# Patch03: patch-2.6.24.1-rc1.bz2
+# Patch03: patch-2.6.25.6-rc1.bz2
 
 Patch10: linux-2.6-upstream-reverts.patch
 
@@ -577,11 +577,6 @@
 Patch80: linux-2.6-smp-boot-delay.patch
 Patch85: linux-2.6-x86-dont-map-vdso-when-disabled.patch
 Patch86: linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch
-Patch87: linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
-Patch88: linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
-Patch89: linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
-Patch90: linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch
-Patch91: linux-2.6-x86-prevent-pge-flush-from-interruption.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch140: linux-2.6-ps3-ehci-iso.patch
@@ -615,16 +610,11 @@
 Patch414: linux-2.6-alsa-emu10k1-fix-audigy2.patch
 
 # filesystem patches
-Patch420: linux-2.6-cifs-fix-unc-path-prefix.patch
 Patch421: linux-2.6-squashfs.patch
-Patch422: linux-2.6-ext34-xattr-fix.patch
-Patch423: linux-2.6-xfs-small-buffer-reads.patch
 
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch431: linux-2.6-net-iptables-add-xt_iprange-aliases.patch
 Patch432: linux-2.6-netlink-fix-parse-of-nested-attributes.patch
 
-Patch440: linux-2.6-caps-remain-source-compatible-with-32-bit.patch
 
 Patch450: linux-2.6-input-kill-stupid-messages.patch
 Patch451: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
@@ -637,7 +627,6 @@
 
 # libata
 Patch670: linux-2.6-ata-quirk.patch
-Patch671: linux-2.6-libata-force-hardreset-in-sleep-mode.patch
 Patch672: linux-2.6-libata-acpi-hotplug-fixups.patch
 Patch673: linux-2.6-libata-be-a-bit-more-slack-about-early-devices.patch
 Patch674: linux-2.6-sata-eeepc-faster.patch
@@ -1008,7 +997,7 @@
 %endif
 
 # stable release candidate
-# ApplyPatch patch-2.6.24.1-rc1.bz2
+# ApplyPatch patch-2.6.25.6-rc1.bz2
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
@@ -1049,17 +1038,6 @@
 # don't map or use disabled x86 vdso
 ApplyPatch linux-2.6-x86-dont-map-vdso-when-disabled.patch
 ApplyPatch linux-2.6-x86-dont-use-disabled-vdso-for-signals.patch
-# ecx is clobbered during IRQs (!)
-ApplyPatch linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
-# allocate PCI ROM by default again
-ApplyPatch linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
-# don't read the apic if it's not mapped (#447183)
-ApplyPatch linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
-# fix sched_clock when calibrated against PIT
-ApplyPatch linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch
-# dont allow flush_tlb_all to be interrupted
-ApplyPatch linux-2.6-x86-prevent-pge-flush-from-interruption.patch
-
 
 #
 # PowerPC
@@ -1158,24 +1136,16 @@
 
 # Filesystem patches.
 # cifs
-ApplyPatch linux-2.6-cifs-fix-unc-path-prefix.patch
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
-# more filesystem patches
-ApplyPatch linux-2.6-ext34-xattr-fix.patch
-ApplyPatch linux-2.6-xfs-small-buffer-reads.patch
 
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# fix firewall scripts using iprange (#446827)
-ApplyPatch linux-2.6-net-iptables-add-xt_iprange-aliases.patch
 # fix parse of netlink messages
 ApplyPatch linux-2.6-netlink-fix-parse-of-nested-attributes.patch
 
 # Misc fixes
-# make 64-bit capabilities backwards compatible
-ApplyPatch linux-2.6-caps-remain-source-compatible-with-32-bit.patch
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
 # add support for macbook pro 4,1 and macbook air keyboards
@@ -1200,8 +1170,6 @@
 # libata
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
-# wake up links that have been put to sleep by BIOS (#436099)
-ApplyPatch linux-2.6-libata-force-hardreset-in-sleep-mode.patch
 # fix hangs on undock (#439197)
 ApplyPatch linux-2.6-libata-acpi-hotplug-fixups.patch
 # fix problems with some old/broken CF hardware (F8 #224005)
@@ -1865,6 +1833,23 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-50
+- Linux 2.6.25.6
+- Dropped patches:
+    linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch
+    linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch
+    linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch
+    linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch
+    linux-2.6-x86-prevent-pge-flush-from-interruption.patch
+    linux-2.6-cifs-fix-unc-path-prefix.patch
+    linux-2.6-ext34-xattr-fix.patch
+    linux-2.6-xfs-small-buffer-reads.patch
+    linux-2.6-net-iptables-add-xt_iprange-aliases.patch
+    linux-2.6-caps-remain-source-compatible-with-32-bit.patch
+    linux-2.6-libata-force-hardreset-in-sleep-mode.patch
+- Updated patches:
+    linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
+
 * Fri Jun 06 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.5-49
 - Fix the specfile to match the kernel version.
 

linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch:

Index: linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch	27 May 2008 20:49:16 -0000	1.1
+++ linux-2.6-input-fix_fn_key_on_macbookpro_4_1_and_mb_air.patch	9 Jun 2008 20:24:45 -0000	1.2
@@ -1,29 +1,44 @@
-diff -uNr linux.vanilla/drivers/hid/usbhid/hid-quirks.c linux.new/drivers/hid/usbhid/hid-quirks.c
---- linux.vanilla/drivers/hid/usbhid/hid-quirks.c	2008-04-10 08:45:16.000000000 -0400
-+++ linux.new/drivers/hid/usbhid/hid-quirks.c	2008-05-19 19:59:19.000000000 -0400
-@@ -68,6 +68,12 @@
+The keyboards in recent Apple hardware are still not properly supported 
+by Linux due to them not being in the hid quirks table. This patch adds 
+the current hardware. Device IDs come from the Mactel Linux project.
+
+Signed-off-by: Matthew Garrett <mjg at redhat.com>
+
+diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
+index 1df832a..5214b0d 100644
+--- a/drivers/hid/usbhid/hid-quirks.c
++++ b/drivers/hid/usbhid/hid-quirks.c
+@@ -69,12 +69,19 @@
+ #define USB_DEVICE_ID_APPLE_ALU_ANSI	0x0220
+ #define USB_DEVICE_ID_APPLE_ALU_ISO	0x0221
+ #define USB_DEVICE_ID_APPLE_ALU_JIS	0x0222
++#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI    0x0223
++#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO     0x0224
++#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS     0x0225
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI    0x0229
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO     0x022a
+ #define USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS     0x022b
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI  0x022c
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO   0x022d
  #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS   0x022e
-+#define USB_DEVICE_ID_APPLE_WELLSPRING_ANSI   0x0223
-+#define USB_DEVICE_ID_APPLE_WELLSPRING_ISO    0x0224
-+#define USB_DEVICE_ID_APPLE_WELLSPRING_JIS    0x0225
 +#define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI   0x0230
 +#define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO    0x0231
 +#define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS    0x0232
++
  #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a
  #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b
  #define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242
-@@ -572,6 +578,12 @@
- 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
- 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
- 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_HAS_FN },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_HAS_FN },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_HAS_FN },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-+	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_HAS_FN },
- 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
- 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+@@ -644,6 +651,12 @@ static const struct hid_blacklist {
+ 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
+ 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+ 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
++	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
  
+ 	{ USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
+ 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/sources,v
retrieving revision 1.774
retrieving revision 1.775
diff -u -r1.774 -r1.775
--- sources	7 Jun 2008 03:24:19 -0000	1.774
+++ sources	9 Jun 2008 20:24:45 -0000	1.775
@@ -1,2 +1,2 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
-7aa6fbadb357f92f26c9063ea6a490a4  patch-2.6.25.5.bz2
+124200a50019e7da6010bf7fdd7fb5dc  patch-2.6.25.6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/upstream,v
retrieving revision 1.693
retrieving revision 1.694
diff -u -r1.693 -r1.694
--- upstream	7 Jun 2008 03:24:19 -0000	1.693
+++ upstream	9 Jun 2008 20:24:46 -0000	1.694
@@ -1,2 +1,2 @@
 linux-2.6.25.tar.bz2
-patch-2.6.25.5.bz2
+patch-2.6.25.6.bz2


--- linux-2.6-caps-remain-source-compatible-with-32-bit.patch DELETED ---


--- linux-2.6-cifs-fix-unc-path-prefix.patch DELETED ---


--- linux-2.6-ext34-xattr-fix.patch DELETED ---


--- linux-2.6-libata-force-hardreset-in-sleep-mode.patch DELETED ---


--- linux-2.6-net-iptables-add-xt_iprange-aliases.patch DELETED ---


--- linux-2.6-x86-dont-read-maxlvt-if-apic-unmapped.patch DELETED ---


--- linux-2.6-x86-fix-asm-constraint-in-do_IRQ.patch DELETED ---


--- linux-2.6-x86-fix-setup-of-cyc2ns-in-tsc_64.patch DELETED ---


--- linux-2.6-x86-pci-revert-remove-default-rom-allocation.patch DELETED ---


--- linux-2.6-x86-prevent-pge-flush-from-interruption.patch DELETED ---


--- linux-2.6-xfs-small-buffer-reads.patch DELETED ---


--- patch-2.6.25.5.bz2.sign DELETED ---


