Fri Aug 10 17:51:32 UTC 2007

Author: cebbert

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

Modified Files:
	.cvsignore kernel-2.6.spec sources upstream 
Added Files:
	linux-2.6-serial-revert-platform-conversion.patch 
	linux-2.6-softmac-fix-essid-problem_R.patch 
	patch-2.6.22.2.bz2.sign 
Removed Files:
	linux-2.6-acpi-dock-oops.patch 
	linux-2.6-amd-disabled-svm-detect-msr-1.patch 
	linux-2.6-amd-disabled-svm-detect.patch 
	linux-2.6-bluetooth-hangup-tty-before-rfcomm.patch 
	linux-2.6-cpufreq-acpi-fix-msr-write.patch 
	linux-2.6-i386-hpet-check-if-the-counter-works.patch 
	linux-2.6-input-rfkill-wrong-size-flags.patch 
	linux-2.6-ipc-shm-fix-user-leakage.patch 
	linux-2.6-jbd-fix-transaction-dropping.patch 
	linux-2.6-libata-ich8m-add-pciid.patch 
	linux-2.6-libata-unbreak-smart-2.patch 
	linux-2.6-libata-unbreak-smart.patch 
	linux-2.6-net-dst_entry-reorder-crash.patch 
	linux-2.6-net_sched_fix_deadlock.patch 
	linux-2.6-seq_operations-leak.patch 
	linux-2.6-tcp-sack-fix-leak-msgs.patch 
	linux-2.6-usb-ftdi_sio-fix-oops.patch patch-2.6.22.1.bz2.sign 
Log Message:
* Fri Aug 10 2007 Chuck Ebbert <cebbert at redhat.com>
- 2.6.22.2
- serial: revert changes to port detection


linux-2.6-serial-revert-platform-conversion.patch:

--- NEW FILE linux-2.6-serial-revert-platform-conversion.patch ---
Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=57d4810ea0d9ca58a7bcc1336607f0cede0a2abf
Commit:     57d4810ea0d9ca58a7bcc1336607f0cede0a2abf
Parent:     a583f1b54249b11ad1ffd14c6e74d28fcbc59c07
Author:     Andrew Morton <akpm at linux-foundation.org>
AuthorDate: Tue Jul 31 00:38:02 2007 -0700
Committer:  Linus Torvalds <torvalds at woody.linux-foundation.org>
CommitDate: Tue Jul 31 15:39:38 2007 -0700

    revert "x86, serial: convert legacy COM ports to platform devices"
    
    Revert 7e92b4fc345f5b6f57585fbe5ffdb0f24d7c9b26.  It broke SÃ©bastien DuguÃ©'s
    machine and Jeff said (persuasively)
    
      This seems like it will break decades-long-working stuff, in favor of
      breaking new ground in our favorite area, "trusting the BIOS."
    
      It's just not worth it for serial ports, IMO.  Serial ports are something
      that just shouldn't break at this late stage in the game.  My new Intel
      platform boxes don't even have serial ports, so I question the value of
      messing with serial port probing even more...  because...  just wait a year,
      and your box won't have a serial port either!  :)
    
      I certainly don't object to the use of platform devices (or isa_driver),
      but the probe change seems questionable.  That's sorta analagous to
      rewriting the floppy driver probe routine.  Sure you could do it...  but why
      risk all that damage and go through debugging all over again?
    
      It seems clear from this report that we cannot, should not, trust BIOS for
      something (a) so simple and (b) that has been working for over a decade.
    
    Much discussion ensued and we've decided to have another go at all of this.
    
    Cc: SÃ©bastien DuguÃ© <sebastien.dugue at bull.net>
    Cc: Bjorn Helgaas <bjorn.helgaas at hp.com>
    Cc: Len Brown <lenb at kernel.org>
    Cc: Adam Belay <ambx1 at neo.rr.com>
    Cc: Matthew Garrett <mjg59 at srcf.ucam.org>
    Cc: Russell King <rmk at arm.linux.org.uk>
    Cc: Jeff Garzik <jeff at garzik.org>
    Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
    Cc: Michal Piotrowski <michal.k.k.piotrowski at gmail.com>
    Cc: Sascha Sommer <saschasommer at freenet.de>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
---
 Documentation/kernel-parameters.txt |    5 ---
 arch/i386/kernel/Makefile           |    1 -
 arch/i386/kernel/legacy_serial.c    |   67 -----------------------------------
 arch/x86_64/kernel/Makefile         |    2 -
 drivers/serial/Kconfig              |   14 +++-----
 include/asm-i386/serial.h           |   16 ++++++++
 include/asm-x86_64/serial.h         |   16 ++++++++
 7 files changed, 37 insertions(+), 84 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d763ebe..efdb42f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -864,11 +864,6 @@ and is between 256 and 4096 characters. It is defined in the file
 	lasi=		[HW,SCSI] PARISC LASI driver for the 53c700 chip
 			Format: addr:<io>,irq:<irq>
 
-	legacy_serial.force [HW,IA-32,X86-64]
-			Probe for COM ports at legacy addresses even
-			if PNPBIOS or ACPI should describe them.  This
-			is for working around firmware defects.
-
 	llsc*=		[IA64] See function print_params() in
 			arch/ia64/sn/kernel/llsc4.c.
 
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index dbe5e87..9d33b00 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -35,7 +35,6 @@ obj-y				+= sysenter.o vsyscall.o
 obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
 obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
 obj-$(CONFIG_DOUBLEFAULT) 	+= doublefault.o
-obj-$(CONFIG_SERIAL_8250)	+= legacy_serial.o
 obj-$(CONFIG_VM86)		+= vm86.o
 obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_HPET_TIMER) 	+= hpet.o
diff --git a/arch/i386/kernel/legacy_serial.c b/arch/i386/kernel/legacy_serial.c
deleted file mode 100644
index 2151011..0000000
--- a/arch/i386/kernel/legacy_serial.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Legacy COM port devices for x86 platforms without PNPBIOS or ACPI.
- * Data taken from include/asm-i386/serial.h.
- *
- * (c) Copyright 2007 Hewlett-Packard Development Company, L.P.
- *	Bjorn Helgaas <bjorn.helgaas at hp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pnp.h>
-#include <linux/serial_8250.h>
-
-/* Standard COM flags (except for COM4, because of the 8514 problem) */
-#ifdef CONFIG_SERIAL_DETECT_IRQ
-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ)
-#define COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ)
-#else
-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
-#define COM4_FLAGS UPF_BOOT_AUTOCONF
-#endif
-
-#define PORT(_base,_irq,_flags)				\
-	{						\
-		.iobase		= _base,		\
-		.irq		= _irq,			\
-		.uartclk	= 1843200,		\
-		.iotype		= UPIO_PORT,		\
-		.flags		= _flags,		\
-	}
-
-static struct plat_serial8250_port x86_com_data[] = {
-	PORT(0x3F8, 4, COM_FLAGS),
-	PORT(0x2F8, 3, COM_FLAGS),
-	PORT(0x3E8, 4, COM_FLAGS),
-	PORT(0x2E8, 3, COM4_FLAGS),
-	{ },
-};
-
-static struct platform_device x86_com_device = {
-	.name			= "serial8250",
-	.id			= PLAT8250_DEV_PLATFORM,
-	.dev			= {
-		.platform_data	= x86_com_data,
-	},
-};
-
-static int force_legacy_probe;
-module_param_named(force, force_legacy_probe, bool, 0);
-MODULE_PARM_DESC(force, "Force legacy serial port probe");
-
-static int __init serial8250_x86_com_init(void)
-{
-	if (pnp_platform_devices && !force_legacy_probe)
-		return -ENODEV;
-
-	return platform_device_register(&x86_com_device);
-}
-
-module_init(serial8250_x86_com_init);
-
-MODULE_AUTHOR("Bjorn Helgaas");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Generic 8250/16x50 legacy probe module");
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index d1d18c1..ff5d8c9 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_IOMMU)		+= pci-gart.o aperture.o
 obj-$(CONFIG_CALGARY_IOMMU)	+= pci-calgary.o tce.o
 obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb.o
-obj-$(CONFIG_SERIAL_8250)	+= legacy_serial.o
 obj-$(CONFIG_KPROBES)		+= kprobes.o
 obj-$(CONFIG_X86_PM_TIMER)	+= pmtimer.o
 obj-$(CONFIG_X86_VSMP)		+= vsmp.o
@@ -51,7 +50,6 @@ CFLAGS_vsyscall.o		:= $(PROFILING) -g0
 
 therm_throt-y                   += ../../i386/kernel/cpu/mcheck/therm_throt.o
 bootflag-y			+= ../../i386/kernel/bootflag.o
-legacy_serial-y			+= ../../i386/kernel/legacy_serial.o
 cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
 topology-y                     += ../../i386/kernel/topology.o
 microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 18f6297..819fc3e 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -88,21 +88,17 @@ config SERIAL_8250_PCI
 	depends on SERIAL_8250 && PCI
 	default SERIAL_8250
 	help
-	  Say Y here if you have PCI serial ports.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called 8250_pci.
+	  This builds standard PCI serial support. You may be able to
+	  disable this feature if you only need legacy serial support.
+	  Saves about 9K.
 
 config SERIAL_8250_PNP
 	tristate "8250/16550 PNP device support" if EMBEDDED
 	depends on SERIAL_8250 && PNP
 	default SERIAL_8250
 	help
-	  Say Y here if you have serial ports described by PNPBIOS or ACPI.
-	  These are typically ports built into the system board.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called 8250_pnp.
+	  This builds standard PNP serial support. You may be able to
+	  disable this feature if you only need legacy serial support.
 
 config SERIAL_8250_HP300
 	tristate
diff --git a/include/asm-i386/serial.h b/include/asm-i386/serial.h
index 57a4306..bd67480 100644
--- a/include/asm-i386/serial.h
+++ b/include/asm-i386/serial.h
@@ -11,3 +11,19 @@
  * megabits/second; but this requires the faster clock.
  */
 #define BASE_BAUD ( 1843200 / 16 )
+
+/* Standard COM flags (except for COM4, because of the 8514 problem) */
+#ifdef CONFIG_SERIAL_DETECT_IRQ
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
+#else
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+#endif
+
+#define SERIAL_PORT_DFNS			\
+	/* UART CLK   PORT IRQ     FLAGS        */			\
+	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },	/* ttyS0 */	\
+	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },	/* ttyS1 */	\
+	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },	/* ttyS2 */	\
+	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },	/* ttyS3 */
diff --git a/include/asm-x86_64/serial.h b/include/asm-x86_64/serial.h
index 8ebd765..b0496e0 100644
--- a/include/asm-x86_64/serial.h
+++ b/include/asm-x86_64/serial.h
@@ -11,3 +11,19 @@
  * megabits/second; but this requires the faster clock.
  */
 #define BASE_BAUD ( 1843200 / 16 )
+
+/* Standard COM flags (except for COM4, because of the 8514 problem) */
+#ifdef CONFIG_SERIAL_DETECT_IRQ
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
+#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
+#else
+#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
+#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
+#endif
+
+#define SERIAL_PORT_DFNS			\
+	/* UART CLK   PORT IRQ     FLAGS        */			\
+	{ 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS },	/* ttyS0 */	\
+	{ 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS },	/* ttyS1 */	\
+	{ 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS },	/* ttyS2 */	\
+	{ 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS },	/* ttyS3 */

linux-2.6-softmac-fix-essid-problem_R.patch:

--- NEW FILE linux-2.6-softmac-fix-essid-problem_R.patch ---
>From stable-bounces at linux.kernel.org Tue Jul 17 08:47:14 2007
From: Jean Tourrilhes <jt at hpl.hp.com>
Date: Tue, 17 Jul 2007 10:46:33 -0500
Subject: softmac: Fix ESSID problem
To: stable at kernel.org
Cc: linux-wireless at vger.kernel.org
Message-ID: <469CE459.4070300 at lwfinger.net>


From: Jean Tourrilhes <jt at hpl.hp.com>

Victor Porton reported that the SoftMAC layer had random problem when setting the ESSID :
http://bugzilla.kernel.org/show_bug.cgi?id=8686 After investigation, it turned out to be
worse, the SoftMAC layer is left in an inconsistent state. The fix is pretty trivial.

Signed-off-by: Jean Tourrilhes <jt at hpl.hp.com>
Acked-by: Michael Buesch <mb at bu3sch.df>
Acked-by: Larry Finger <Larry.Finger at lwfinger.net>
Acked-by: John W. Linville <linville at tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

---
 net/ieee80211/softmac/ieee80211softmac_assoc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/net/ieee80211/softmac/ieee80211softmac_assoc.c
+++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c
@@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_
 			 */
 			dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n");
 			ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL);
-			if (ieee80211softmac_start_scan(mac))
+			if (ieee80211softmac_start_scan(mac)) {
 				dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n");
+				mac->associnfo.associating = 0;
+				mac->associnfo.associated = 0;
+			}
 			goto out;
 		} else {
 			mac->associnfo.associating = 0;


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

iD8DBQBGu4u2yGugalF9Dw4RAlLtAJ4zDg1R8uIdb8zAJ/z1PlmQKqzLDQCdFwOl
Sap9NPoyvbhqOBCc2/AOL4Y=
=fHUk
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/.cvsignore,v
retrieving revision 1.627
retrieving revision 1.628
diff -u -r1.627 -r1.628
--- .cvsignore	11 Jul 2007 19:33:44 -0000	1.627
+++ .cvsignore	10 Aug 2007 17:51:00 -0000	1.628
@@ -3,4 +3,4 @@
 temp-*
 kernel-2.6.22
 linux-2.6.22.tar.bz2
-patch-2.6.22.1.bz2
+patch-2.6.22.2.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3311
retrieving revision 1.3312
diff -u -r1.3311 -r1.3312
--- kernel-2.6.spec	10 Aug 2007 17:27:08 -0000	1.3311
+++ kernel-2.6.spec	10 Aug 2007 17:51:00 -0000	1.3312
@@ -30,7 +30,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 1
+%define stable_update 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
@@ -498,6 +498,9 @@
 
 %if !%{nopatches}
 
+# Revert -stable pieces we get from elsewhere
+Patch05: linux-2.6-softmac-fix-essid-problem_R.patch
+
 Patch10: linux-2.6-utrace-tracehook.patch
 Patch11: linux-2.6-utrace-tracehook-ia64.patch
 Patch12: linux-2.6-utrace-tracehook-sparc64.patch
@@ -520,11 +523,9 @@
 Patch35: linux-2.6-irq-dont-mask-interrupts-_reversed_.patch
 Patch40: linux-2.6-x86-tune-generic.patch
 Patch50: linux-2.6-x86-vga-vidfail.patch
-Patch51: linux-2.6-i386-hpet-check-if-the-counter-works.patch
 Patch52: linux-2.6-amd-fix-broken-lapic-timer-detect.patch
 Patch90: linux-2.6-kvm-suspend.patch
-Patch91: linux-2.6-amd-disabled-svm-detect.patch
-Patch92: linux-2.6-amd-disabled-svm-detect-msr-1.patch
+Patch91: linux-2.6-serial-revert-platform-conversion.patch
 Patch93: linux-2.6-kvm-reinit-real-mode-tss.patch
 
 Patch100: linux-2.6-g5-therm-shutdown.patch
@@ -559,21 +560,15 @@
 Patch340: linux-2.6-debug-sysfs-crash-debugging.patch
 Patch350: linux-2.6-devmem.patch
 Patch370: linux-2.6-crash-driver.patch
-Patch380: linux-2.6-bluetooth-hangup-tty-before-rfcomm.patch
 Patch390: linux-2.6-dev-get-driver-properly.patch
 Patch400: linux-2.6-scsi-cpqarray-set-master.patch
 Patch401: linux-2.6-aacraid-ioctl-security.patch
 Patch420: linux-2.6-squashfs.patch
-Patch421: linux-2.6-jbd-fix-transaction-dropping.patch
 Patch422: linux-2.6-gfs2-update.patch
 Patch430: linux-2.6-net-silence-noisy-printks.patch
-Patch431: linux-2.6-tcp-sack-fix-leak-msgs.patch
-Patch432: linux-2.6-net_sched_fix_deadlock.patch
-Patch433: linux-2.6-net-dst_entry-reorder-crash.patch
 Patch434: linux-2.6-add_xt_statistic.h_to_hdrs.patch
 Patch440: linux-2.6-sha_alignment.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
-Patch451: linux-2.6-input-rfkill-wrong-size-flags.patch
 Patch460: linux-2.6-serial-460800.patch
 Patch480: linux-2.6-proc-self-maps-fix.patch
 Patch490: linux-2.6-softlockup-disable.patch
@@ -586,12 +581,9 @@
 Patch620: linux-2.6-defaults-unicode-vt.patch
 Patch630: linux-2.6-defaults-nonmi.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
-Patch661: linux-2.6-libata-ich8m-add-pciid.patch
 Patch662: linux-2.6-ata-update-noncq.patch
 Patch663: linux-2.6-ata-quirk.patch
 Patch664: linux-2.6-libata-sb700-sata-ids.patch
-Patch665: linux-2.6-libata-unbreak-smart.patch
-Patch666: linux-2.6-libata-unbreak-smart-2.patch
 Patch667: linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
 Patch668: linux-2.6-libata_pata_atiixp_add_ati_sb700.patch
 Patch670: linux-2.6-libata-pata_hpt37x-fix-2.6.22-clock-pll.patch
@@ -612,10 +604,7 @@
 Patch740: linux-2.6-sdhci-ene-controller-quirk.patch
 Patch741: linux-2.6-sdhci-fix-interrupt-mask.patch
 Patch742: linux-2.6-sdhci-clear-error-interrupt.patch
-Patch760: linux-2.6-usb-ftdi_sio-fix-oops.patch
 #Patch780: linux-2.6-clockevents-fix-resume-logic.patch
-Patch790: linux-2.6-acpi-dock-oops.patch
-Patch791: linux-2.6-cpufreq-acpi-fix-msr-write.patch
 Patch800: linux-2.6-wakeups-hdaps.patch
 Patch801: linux-2.6-wakeups.patch
 Patch900: linux-2.6-sched-cfs.patch
@@ -640,8 +629,6 @@
 Patch1320: linux-2.6-ps3-storage-alias.patch
 
 Patch1400: linux-2.6-pcspkr-use-the-global-pit-lock.patch
-Patch1420: linux-2.6-seq_operations-leak.patch
-Patch1421: linux-2.6-ipc-shm-fix-user-leakage.patch
 
 %endif
 
@@ -1082,6 +1069,9 @@
 
 %if !%{nopatches}
 
+# Revert -stable pieces we get from elsewhere
+ApplyPatch linux-2.6-softmac-fix-essid-problem_R.patch -R
+
 # Ingo's new scheduler.
 ApplyPatch linux-2.6-sched-cfs.patch
 
@@ -1131,16 +1121,13 @@
 # for the installer cd that wants to automatically fall back to textmode
 # in that case
 ApplyPatch linux-2.6-x86-vga-vidfail.patch
-# Check the hpet is counting.
-ApplyPatch linux-2.6-i386-hpet-check-if-the-counter-works.patch
 # check all AMD CPU cores for broken lapic timer
 ApplyPatch linux-2.6-amd-fix-broken-lapic-timer-detect.patch
 
 # patch to fix suspend with kvm loaded and guests running
 ApplyPatch linux-2.6-kvm-suspend.patch
-# detect svm disabled by bios, prevent oops on load
-ApplyPatch linux-2.6-amd-disabled-svm-detect.patch
-ApplyPatch linux-2.6-amd-disabled-svm-detect-msr-1.patch
+# revert to old legacy serial port detection
+ApplyPatch linux-2.6-serial-revert-platform-conversion.patch
 # reinit real mode tss or oops occurs on shutdown
 ApplyPatch linux-2.6-kvm-reinit-real-mode-tss.patch
 
@@ -1216,7 +1203,6 @@
 #
 # bluetooth
 #
-ApplyPatch linux-2.6-bluetooth-hangup-tty-before-rfcomm.patch
 
 #
 # driver core
@@ -1234,20 +1220,12 @@
 # Filesystem patches.
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
-# jbd: fix transaction dropping
-ApplyPatch linux-2.6-jbd-fix-transaction-dropping.patch
 # gfs2 update to latest
 ApplyPatch linux-2.6-gfs2-update.patch
 
 # Networking
 # Disable easy to trigger printk's.
 ApplyPatch linux-2.6-net-silence-noisy-printks.patch
-# fix leak in tcp SACk processing
-ApplyPatch linux-2.6-tcp-sack-fix-leak-msgs.patch
-# deadlock in net scheduler(s)
-ApplyPatch linux-2.6-net_sched_fix_deadlock.patch
-# fix crash in xfrm4
-ApplyPatch linux-2.6-net-dst_entry-reorder-crash.patch
 # add header needed to build new iptables
 ApplyPatch linux-2.6-add_xt_statistic.h_to_hdrs.patch
 
@@ -1256,8 +1234,6 @@
 ApplyPatch linux-2.6-sha_alignment.patch
 # The input layer spews crap no-one cares about.
 ApplyPatch linux-2.6-input-kill-stupid-messages.patch
-# rfkill driver screws up flags
-ApplyPatch linux-2.6-input-rfkill-wrong-size-flags.patch
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
 # Add a safety net to softlockup so that it doesn't prevent installs.
@@ -1290,17 +1266,12 @@
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
 # libata: don't initialize sg in ata_exec_internal() if DMA_NONE
-#libata add ich8m (santa rosa) pata controller ID
-ApplyPatch linux-2.6-libata-ich8m-add-pciid.patch
 # libata: update the noncq list
 ApplyPatch linux-2.6-ata-update-noncq.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 # add more ati sb700 ids to the ahci driver
 ApplyPatch linux-2.6-libata-sb700-sata-ids.patch
-# Unbreak SMART on libata.
-ApplyPatch linux-2.6-libata-unbreak-smart.patch
-ApplyPatch linux-2.6-libata-unbreak-smart-2.patch
 # NSIA
 ApplyPatch linux-2.6-libata-ata_piix_fix_pio-mwdma-programming.patch
 # add ID for sb700 to the pata driver
@@ -1350,13 +1321,8 @@
 
 # USB
 #
-ApplyPatch linux-2.6-usb-ftdi_sio-fix-oops.patch
 
 # ACPI patches
-# Fix ACPI dock oops (#238054)
-ApplyPatch linux-2.6-acpi-dock-oops.patch
-# acpi-cpufreq: fix register writes
-ApplyPatch linux-2.6-cpufreq-acpi-fix-msr-write.patch
 
 # Fix excessive wakeups
 # Make hdaps timer only tick when in use.
@@ -1386,10 +1352,6 @@
 
 ApplyPatch linux-2.6-pcspkr-use-the-global-pit-lock.patch
 
-# fix leaks of struct seq_operations
-ApplyPatch linux-2.6-seq_operations-leak.patch
-# fix leaks of ref to user struct
-ApplyPatch linux-2.6-ipc-shm-fix-user-leakage.patch
 
 # END OF PATCH APPLICATIONS
 
@@ -2313,6 +2275,10 @@
 
 %changelog
 * Fri Aug 10 2007 Chuck Ebbert <cebbert at redhat.com>
+- 2.6.22.2
+- serial: revert changes to port detection
+
+* Fri Aug 10 2007 Chuck Ebbert <cebbert at redhat.com>
 - don't use incremental patches for -stable updates
 - update CFS scheduler patch
 - update utrace patches


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/sources,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- sources	11 Jul 2007 19:33:44 -0000	1.590
+++ sources	10 Aug 2007 17:51:00 -0000	1.591
@@ -1,2 +1,2 @@
 2e230d005c002fb3d38a3ca07c0200d0  linux-2.6.22.tar.bz2
-a29ac92cd688d591afd3fec48905e329  patch-2.6.22.1.bz2
+1bf6e4e5100b9af1f5eb361cff5a443e  patch-2.6.22.2.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/upstream,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- upstream	11 Jul 2007 23:06:40 -0000	1.514
+++ upstream	10 Aug 2007 17:51:00 -0000	1.515
@@ -1,2 +1,2 @@
 linux-2.6.22.tar.bz2
-patch-2.6.22.1.bz2
+patch-2.6.22.2.bz2


--- linux-2.6-acpi-dock-oops.patch DELETED ---


--- linux-2.6-amd-disabled-svm-detect-msr-1.patch DELETED ---


--- linux-2.6-amd-disabled-svm-detect.patch DELETED ---


--- linux-2.6-bluetooth-hangup-tty-before-rfcomm.patch DELETED ---


--- linux-2.6-cpufreq-acpi-fix-msr-write.patch DELETED ---


--- linux-2.6-i386-hpet-check-if-the-counter-works.patch DELETED ---


--- linux-2.6-input-rfkill-wrong-size-flags.patch DELETED ---


--- linux-2.6-ipc-shm-fix-user-leakage.patch DELETED ---


--- linux-2.6-jbd-fix-transaction-dropping.patch DELETED ---


--- linux-2.6-libata-ich8m-add-pciid.patch DELETED ---


--- linux-2.6-libata-unbreak-smart-2.patch DELETED ---


--- linux-2.6-libata-unbreak-smart.patch DELETED ---


--- linux-2.6-net-dst_entry-reorder-crash.patch DELETED ---


--- linux-2.6-net_sched_fix_deadlock.patch DELETED ---


--- linux-2.6-seq_operations-leak.patch DELETED ---


--- linux-2.6-tcp-sack-fix-leak-msgs.patch DELETED ---


--- linux-2.6-usb-ftdi_sio-fix-oops.patch DELETED ---


--- patch-2.6.22.1.bz2.sign DELETED ---


