Hello community, here is the log from the commit of package kernel-source checked in at Tue Dec 19 17:29:02 CET 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-11-27 12:46:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2006-12-19 11:54:52.000000000 +0100 @@ -1,0 +2,112 @@ +Mon Dec 11 14:54:28 CET 2006 - jbeulich@novell.com + +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). + +------------------------------------------------------------------- +Mon Dec 11 10:17:28 CET 2006 - olh@suse.de + +- enable mptsas on ppc64 (225712 - LTC28557) + +------------------------------------------------------------------- +Sat Dec 9 14:20:06 CET 2006 - olh@suse.de + +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk + +------------------------------------------------------------------- +Sat Dec 9 12:15:42 CET 2006 - olh@suse.de + +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd + +------------------------------------------------------------------- +Mon Dec 4 15:17:51 CET 2006 - jdelvare@suse.de + +- Re-enable e1000 packet split. It was disabled to fix bug + #220210, but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. + +------------------------------------------------------------------- +Mon Dec 4 10:02:55 CET 2006 - jbeulich@novell.com + +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). + +------------------------------------------------------------------- +Sat Dec 2 08:25:22 CET 2006 - gregkh@suse.de + +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. + +------------------------------------------------------------------- +Fri Dec 1 23:36:05 CET 2006 - olh@suse.de + +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) + +------------------------------------------------------------------- +Fri Dec 1 12:02:57 CET 2006 - hare@suse.de + +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. + +------------------------------------------------------------------- +Fri Dec 1 11:06:48 CET 2006 - olh@suse.de + +- mark jsm as supported (218969 - LTC29005) + +------------------------------------------------------------------- +Thu Nov 30 16:47:42 CET 2006 - ak@suse.de + +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. + +------------------------------------------------------------------- +Thu Nov 30 01:11:58 CET 2006 - gregkh@suse.de + +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. + +------------------------------------------------------------------- +Thu Nov 30 00:16:08 CET 2006 - gregkh@suse.de + +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) + +------------------------------------------------------------------- +Thu Nov 30 00:14:05 CET 2006 - gregkh@suse.de + +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. + +------------------------------------------------------------------- +Wed Nov 29 16:15:19 CET 2006 - olh@suse.de + +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build + +------------------------------------------------------------------- +Wed Nov 29 00:46:50 CET 2006 - jeffm@suse.de + +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel + +------------------------------------------------------------------- +Tue Nov 28 22:05:32 CET 2006 - jeffm@suse.de + +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. + +------------------------------------------------------------------- +Tue Nov 28 21:45:06 CET 2006 - jeffm@suse.de + +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.18.2) +# spec file for package kernel-bigsmp (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: Kernel with PAE Support License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-bigsmp-nongpl @@ -90,6 +90,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 @@ -124,12 +125,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-bigsmp-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -470,6 +471,64 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.18.2) +# spec file for package kernel-debug (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 32 +Version: 2.6.18.5 +Release: 1 Summary: A Debug Version of the Kernel License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-debug-nongpl @@ -96,6 +96,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 @@ -129,12 +130,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-debug-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-debug-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -475,6 +476,64 @@ %files -f kernel.files %changelog -n kernel-debug +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.18.2) +# spec file for package kernel-default (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-default-nongpl @@ -118,6 +118,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: alpha %ix86 ia64 ppc ppc64 s390x x86_64 @@ -150,12 +151,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-default-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-default-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -496,6 +497,64 @@ %files -f kernel.files %changelog -n kernel-default +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.18.2) +# spec file for package kernel-dummy (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Autoreqprov: off Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel -Version: 2.6.18.2 -Release: 32 +Version: 2.6.18.5 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %install @@ -40,6 +40,64 @@ /etc/dummy %changelog -n kernel-dummy +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-iseries64 (Version 2.6.18.2) +# spec file for package kernel-iseries64 (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: 64-Bit Kernel for iSeries License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-iseries64-nongpl @@ -93,6 +93,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 @@ -125,12 +126,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-iseries64-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-iseries64-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -471,6 +472,64 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.18.2) +# spec file for package kernel-kdump (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 32 +Version: 2.6.18.5 +Release: 1 Summary: kernel for kdump License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-kdump-nongpl @@ -99,6 +99,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ppc ppc64 x86_64 @@ -134,12 +135,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-kdump-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-kdump-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -480,6 +481,64 @@ %files -f kernel.files %changelog -n kernel-kdump +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.18.2) +# spec file for package kernel-ppc64 (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,8 +27,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: Kernel for ppc64 Systems License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel @@ -36,7 +36,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-ppc64-nongpl @@ -94,6 +94,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 @@ -139,12 +140,12 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-ppc64-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -485,6 +486,64 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.18.2) +# spec file for package kernel-s390 (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 22 +Version: 2.6.18.5 +Release: 1 Summary: The Standard Kernel License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-s390-nongpl @@ -90,6 +90,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: s390 @@ -122,12 +123,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-s390-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-s390-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -468,6 +469,64 @@ %files -f kernel.files %changelog -n kernel-s390 +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.18.2) +# spec file for package kernel-source (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -31,8 +31,8 @@ Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -102,7 +102,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then @@ -125,16 +125,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.18.2/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.18.2/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18.2/$patch; then + > %_builddir/kernel-source-2.6.18.5/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.18.5/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.18.5/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18.2 %source_rel -KERNELRELEASE=2.6.18.2-%source_rel +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.18.5 %source_rel +KERNELRELEASE=2.6.18.5-%source_rel cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS=$symbols @@ -155,8 +155,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.18.2/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.18.2/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.18.5/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.18.5/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -291,6 +291,64 @@ %files -f kernel-source.files %changelog -n kernel-source +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.18.2) +# spec file for package kernel-syms (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -44,14 +44,17 @@ %endif %endif %endif +# the packages above do require other things, but none of those are needed during package build +#!BuildIgnore: irqbalance xen +#!BuildIgnore: perl-Bootloader mkinitrd License: GNU General Public License (GPL) Autoreqprov: off Summary: Kernel Symbol Versions (modversions) Group: Development/Sources -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Requires: linux -Requires: kernel-source = 2.6.18.2-%release +Requires: kernel-source = 2.6.18.5-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -84,7 +87,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %install @@ -129,6 +132,64 @@ /lib/modules/*/modules.alias %changelog -n kernel-syms +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.18.2) +# spec file for package kernel-um (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 32 +Version: 2.6.18.5 +Release: 1 Summary: The User Mode Linux kernel. License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-um-nongpl @@ -95,6 +95,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -130,12 +131,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-um-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-um-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -476,6 +477,64 @@ %files -f kernel.files %changelog -n kernel-um +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.18.2) +# spec file for package kernel-vanilla (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 32 +Version: 2.6.18.5 +Release: 1 Summary: The Standard Kernel - without any SUSE patches License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-vanilla-nongpl @@ -110,6 +110,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: alpha %ix86 ia64 ppc ppc64 s390x x86_64 @@ -142,12 +143,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-vanilla-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -488,6 +489,64 @@ %files -f kernel.files %changelog -n kernel-vanilla +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.18.2) +# spec file for package kernel-xen (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: The Xen Kernel License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-xen-nongpl @@ -93,6 +93,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 @@ -128,12 +129,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-xen-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-xen-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -474,6 +475,64 @@ %files -f kernel.files %changelog -n kernel-xen +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.hakTqs/_old 2006-12-19 17:25:24.000000000 +0100 +++ /var/tmp/diff_new_pack.hakTqs/_new 2006-12-19 17:25:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xenpae (Version 2.6.18.2) +# spec file for package kernel-xenpae (Version 2.6.18.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.18.2 -Release: 33 +Version: 2.6.18.5 +Release: 1 Summary: The Xen Kernel with PAE support License: GNU General Public License (GPL) Group: System/Kernel @@ -37,7 +37,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.18.2-%source_rel +Provides: kernel = 2.6.18.5-%source_rel %endif %endif Provides: kernel-xenpae-nongpl @@ -88,6 +88,7 @@ PreReq: perl-Bootloader >= 0.4.1 PreReq: rpm PreReq: /sbin/update-bootloader +#!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 @@ -125,12 +126,12 @@ -Source Timestamp: 2006/11/27 11:46:27 UTC +Source Timestamp: 2006/12/11 13:52:53 UTC %prep if ! [ -e %_sourcedir/linux-2.6.18.tar.bz2 ]; then - echo "The kernel-xenpae-2.6.18.2.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.18.2.src.rpm." + echo "The kernel-xenpae-2.6.18.5.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.18.5.src.rpm." exit 1 fi symbols=$( @@ -471,6 +472,64 @@ %files -f kernel.files %changelog -n kernel-xenpae +* Mon Dec 11 2006 - jbeulich@novell.com +- patches.fixes/rtc-no-irq.patch: RTC driver init adjustment + (226676). +* Mon Dec 11 2006 - olh@suse.de +- enable mptsas on ppc64 (225712 - LTC28557) +* Sat Dec 09 2006 - olh@suse.de +- add patches.arch/ppc-iseries-rd_size.patch + fix iseries compile error with modular ramdisk +* Sat Dec 09 2006 - olh@suse.de +- build ramdisk driver as module, it was only required for + loop mounted initrds, but its not needed for cpio initrd +* Mon Dec 04 2006 - jdelvare@suse.de +- Re-enable e1000 packet split. It was disabled to fix bug + [#220210], but patch 2.6.18.5 fixes the true cause of the problem + so disabling this feature is no longer necessary. +* Mon Dec 04 2006 - jbeulich@novell.com +- patches.xen/xen-x86_64-agp: add missing header (222174, 224170). +* Sat Dec 02 2006 - gregkh@suse.de +- Update to 2.6.18.5 + - lots of little bug fixes, only 3 of which we already had. +- Update config files. +* Fri Dec 01 2006 - olh@suse.de +- add patches.suse/snd-aoa-device-symlinks.patch + let snd-aoa create sysfs device symlinks (106294) +* Fri Dec 01 2006 - hare@suse.de +- patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt + Fix CD-ROM detection on ICH6M and ICH7M (205331) +- patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt + Update patch to apply again. +* Fri Dec 01 2006 - olh@suse.de +- mark jsm as supported (218969 - LTC29005) +* Thu Nov 30 2006 - ak@suse.de +- patches.fixes/fix-softirq-race: Fix softirq race on bootup + that triggers on emulators. +- patches.fixes/unwind-miscompilation: work around gcc4 issue + with -Os in Dwarf2 stack unwind. +* Thu Nov 30 2006 - gregkh@suse.de +- Fix build error, got burned by patching with fuzz again... +- patches.suse/ppc-powerbook-iso-usbkbd.patch: Delete. +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.4 + - security fix (CVE-2006-5751) +* Thu Nov 30 2006 - gregkh@suse.de +- Update to 2.6.18.3 + - fixes a number of minor things. + - a few security fixes too, (CVE-2005-4352) is one. +* Wed Nov 29 2006 - olh@suse.de +- dont pull perl-Bootloader and mkinitrd during kernel-syms build (224477) + dont pull xen and irqbalance during package build +* Wed Nov 29 2006 - jeffm@suse.de +- enabled patches.fixes/acpi-battery-sleep-fix.diff after checking + with pavel +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/sys_move_pages-leak-fix.diff: Fix sys_move_pages + when a NULL node list is passed. +* Tue Nov 28 2006 - jeffm@suse.de +- patches.fixes/acpi-battery-sleep-fix.diff: ACPI: check battery + status on resume for un/plug events during sleep. (217564) (disabled) * Mon Nov 27 2006 - hare@suse.de - patches.suse/supported-flag: Enable again and set to nowarn. * Mon Nov 27 2006 - hare@suse.de ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-11-27 12:46:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2006-12-19 11:54:48.000000000 +0100 @@ -1 +1 @@ -2006/11/27 11:46:27 UTC +2006/12/11 13:52:53 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default --- old/config/alpha/default 2006-11-20 10:19:46.000000000 +0100 +++ new/config/alpha/default 2006-12-18 13:16:30.000000000 +0100 @@ -884,7 +884,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1381,7 +1381,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/vanilla new/config/alpha/vanilla --- old/config/alpha/vanilla 2006-11-20 10:19:46.000000000 +0100 +++ new/config/alpha/vanilla 2006-12-18 13:16:30.000000000 +0100 @@ -884,7 +884,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1337,7 +1336,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -3231,3 +3230,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp --- old/config/i386/bigsmp 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/bigsmp 2006-12-18 13:16:30.000000000 +0100 @@ -1100,7 +1100,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1611,7 +1611,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/debug 2006-12-18 13:16:30.000000000 +0100 @@ -1100,7 +1100,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1611,7 +1611,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/default 2006-12-18 13:16:30.000000000 +0100 @@ -1103,7 +1103,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1611,7 +1611,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/kdump new/config/i386/kdump --- old/config/i386/kdump 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/kdump 2006-12-18 13:16:31.000000000 +0100 @@ -1098,7 +1098,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1611,7 +1611,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um --- old/config/i386/um 2006-10-26 15:35:03.000000000 +0200 +++ new/config/i386/um 2006-12-18 13:16:31.000000000 +0100 @@ -177,7 +177,7 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/vanilla 2006-12-18 13:16:32.000000000 +0100 @@ -1095,7 +1095,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1555,7 +1554,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -3582,3 +3581,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/xen 2006-12-18 13:16:32.000000000 +0100 @@ -1000,7 +1000,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1431,7 +1431,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2006-11-20 10:19:46.000000000 +0100 +++ new/config/i386/xenpae 2006-12-18 13:16:32.000000000 +0100 @@ -1001,7 +1001,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1433,7 +1433,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2006-11-20 10:19:46.000000000 +0100 +++ new/config/ia64/debug 2006-12-18 13:16:32.000000000 +0100 @@ -883,7 +883,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1290,7 +1290,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2006-11-20 10:19:46.000000000 +0100 +++ new/config/ia64/default 2006-12-18 13:16:32.000000000 +0100 @@ -883,7 +883,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1290,7 +1290,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2006-11-20 10:19:47.000000000 +0100 +++ new/config/ia64/vanilla 2006-12-18 13:16:32.000000000 +0100 @@ -882,7 +882,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1246,7 +1245,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -3027,3 +3026,4 @@ # # Hardware crypto devices # +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default --- old/config/powerpc/default 2006-11-20 10:19:47.000000000 +0100 +++ new/config/powerpc/default 2006-12-18 13:16:32.000000000 +0100 @@ -744,7 +744,7 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=123456 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1098,7 +1098,7 @@ # CONFIG_DL2K is not set CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64 --- old/config/powerpc/iseries64 2006-11-20 10:19:47.000000000 +0100 +++ new/config/powerpc/iseries64 2006-12-18 13:16:32.000000000 +0100 @@ -550,7 +550,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=123456 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -759,7 +759,7 @@ # CONFIG_DL2K is not set CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -967,7 +967,6 @@ # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump --- old/config/powerpc/kdump 2006-11-20 10:19:47.000000000 +0100 +++ new/config/powerpc/kdump 2006-12-18 13:16:32.000000000 +0100 @@ -612,7 +612,7 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=123456 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -969,7 +969,7 @@ # CONFIG_DL2K is not set CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -1282,7 +1282,6 @@ # Multimedia devices # # CONFIG_VIDEO_DEV is not set -CONFIG_VIDEO_V4L2=y # # Digital Video Broadcasting Devices diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64 --- old/config/powerpc/ppc64 2006-11-20 10:19:47.000000000 +0100 +++ new/config/powerpc/ppc64 2006-12-18 13:16:32.000000000 +0100 @@ -666,7 +666,7 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=123456 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -891,10 +891,11 @@ # # Fusion MPT device support # -# CONFIG_FUSION is not set +CONFIG_FUSION=y # CONFIG_FUSION_SPI is not set # CONFIG_FUSION_FC is not set -# CONFIG_FUSION_SAS is not set +CONFIG_FUSION_SAS=m +CONFIG_FUSION_MAX_SGE=128 # # IEEE 1394 (FireWire) support @@ -1037,7 +1038,7 @@ # CONFIG_DL2K is not set CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/vanilla new/config/powerpc/vanilla --- old/config/powerpc/vanilla 2006-11-20 10:19:47.000000000 +0100 +++ new/config/powerpc/vanilla 2006-12-18 13:16:32.000000000 +0100 @@ -744,7 +744,6 @@ CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=123456 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1092,7 +1091,7 @@ # CONFIG_DL2K is not set CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set # CONFIG_NS83820 is not set # CONFIG_HAMACHI is not set # CONFIG_YELLOWFIN is not set @@ -2420,3 +2419,4 @@ # # Hardware crypto devices # +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2006-10-26 15:35:32.000000000 +0200 +++ new/config/s390/default 2006-12-18 13:16:32.000000000 +0100 @@ -563,7 +563,7 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2006-11-06 11:03:00.000000000 +0100 +++ new/config/s390/s390 2006-12-18 13:16:32.000000000 +0100 @@ -561,7 +561,7 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/vanilla new/config/s390/vanilla --- old/config/s390/vanilla 2006-11-20 10:19:47.000000000 +0100 +++ new/config/s390/vanilla 2006-12-18 13:16:32.000000000 +0100 @@ -564,7 +564,6 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=32768 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1033,3 +1032,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2006-11-20 10:19:47.000000000 +0100 +++ new/config/x86_64/debug 2006-12-18 13:16:32.000000000 +0100 @@ -1006,7 +1006,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1422,7 +1422,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2006-11-20 10:19:47.000000000 +0100 +++ new/config/x86_64/default 2006-12-18 13:16:32.000000000 +0100 @@ -1006,7 +1006,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1422,7 +1422,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/kdump new/config/x86_64/kdump --- old/config/x86_64/kdump 2006-11-20 10:19:47.000000000 +0100 +++ new/config/x86_64/kdump 2006-12-18 13:16:33.000000000 +0100 @@ -986,7 +986,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1403,7 +1403,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/um new/config/x86_64/um --- old/config/x86_64/um 2006-10-26 15:35:17.000000000 +0200 +++ new/config/x86_64/um 2006-12-18 13:16:33.000000000 +0100 @@ -136,7 +136,7 @@ CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=64000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2006-11-20 10:19:47.000000000 +0100 +++ new/config/x86_64/vanilla 2006-12-18 13:16:33.000000000 +0100 @@ -1002,7 +1002,6 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1375,7 +1374,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -3189,3 +3188,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_BLK_DEV_RAM=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2006-11-20 10:19:47.000000000 +0100 +++ new/config/x86_64/xen 2006-12-18 13:16:33.000000000 +0100 @@ -945,7 +945,7 @@ CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_UB is not set -CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM=m CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=128000 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 @@ -1361,7 +1361,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y -CONFIG_E1000_DISABLE_PACKET_SPLIT=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m ++++++ kabi.tar.bz2 ++++++ ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/acpi-use-timer-override new/patches.arch/acpi-use-timer-override --- old/patches.arch/acpi-use-timer-override 2006-11-25 19:35:39.000000000 +0100 +++ new/patches.arch/acpi-use-timer-override 2006-12-02 12:24:02.000000000 +0100 @@ -17,15 +17,13 @@ --- Documentation/kernel-parameters.txt | 4 ++++ - arch/i386/kernel/acpi/boot.c | 8 ++++++++ + arch/i386/kernel/acpi/boot.c | 1 + arch/i386/kernel/acpi/earlyquirk.c | 8 +++++++- - arch/x86_64/kernel/early-quirks.c | 8 ++++++++ + arch/x86_64/kernel/io_apic.c | 7 ++++++- include/asm-i386/acpi.h | 1 + include/asm-x86_64/acpi.h | 1 + - 6 files changed, 29 insertions(+), 1 deletion(-) + 6 files changed, 20 insertions(+), 2 deletions(-) -Index: linux-2.6.18/arch/i386/kernel/acpi/boot.c -=================================================================== --- linux-2.6.18.orig/arch/i386/kernel/acpi/boot.c +++ linux-2.6.18/arch/i386/kernel/acpi/boot.c @@ -75,6 +75,7 @@ EXPORT_SYMBOL(acpi_strict); @@ -36,11 +34,9 @@ #ifdef CONFIG_X86_LOCAL_APIC static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; -Index: linux-2.6.18/arch/i386/kernel/acpi/earlyquirk.c -=================================================================== --- linux-2.6.18.orig/arch/i386/kernel/acpi/earlyquirk.c +++ linux-2.6.18/arch/i386/kernel/acpi/earlyquirk.c -@@ -28,11 +28,17 @@ static int __init check_bridge(int vendo +@@ -27,11 +27,17 @@ static int __init check_bridge(int vendo #ifdef CONFIG_ACPI /* According to Nvidia all timer overrides are bogus unless HPET is enabled. */ @@ -59,8 +55,6 @@ } } #endif -Index: linux-2.6.18/include/asm-i386/acpi.h -=================================================================== --- linux-2.6.18.orig/include/asm-i386/acpi.h +++ linux-2.6.18/include/asm-i386/acpi.h @@ -133,6 +133,7 @@ extern int acpi_gsi_to_irq(u32 gsi, unsi @@ -71,8 +65,6 @@ static inline void disable_ioapic_setup(void) { -Index: linux-2.6.18/include/asm-x86_64/acpi.h -=================================================================== --- linux-2.6.18.orig/include/asm-x86_64/acpi.h +++ linux-2.6.18/include/asm-x86_64/acpi.h @@ -165,6 +165,7 @@ extern u8 x86_acpiid_to_apicid[]; @@ -83,8 +75,6 @@ #endif /*__KERNEL__*/ -Index: linux-2.6.18/Documentation/kernel-parameters.txt -=================================================================== --- linux-2.6.18.orig/Documentation/kernel-parameters.txt +++ linux-2.6.18/Documentation/kernel-parameters.txt @@ -158,6 +158,10 @@ running once the system is up. @@ -98,8 +88,6 @@ acpi_dbg_layer= [HW,ACPI] Format: <int> -Index: linux-2.6.18/arch/x86_64/kernel/io_apic.c -=================================================================== --- linux-2.6.18.orig/arch/x86_64/kernel/io_apic.c +++ linux-2.6.18/arch/x86_64/kernel/io_apic.c @@ -337,11 +337,16 @@ void __init check_ioapic(void) @@ -113,7 +101,7 @@ printk(KERN_INFO "Nvidia board " "detected. Ignoring ACPI " "timer override.\n"); -+ printk(KERN_INFO ++ printk(KERN_INFO + "If you got timer trouble " + "try acpi_use_timer_override\n"); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i386-microcode.diff new/patches.arch/i386-microcode.diff --- old/patches.arch/i386-microcode.diff 2006-11-14 18:31:04.000000000 +0100 +++ new/patches.arch/i386-microcode.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -From: Bernhard Walle <bwalle@suse.de> -Subject: x86 microcode: don't check the size -References: #205368 - -IA32 manual says if microcode update's size is 0, then the size is -default size (2048 bytes). But this doesn't suggest all microcode -update's size should be above 2048 bytes to me. We actually had a -microcode update whose size is 1024 bytes. The patch just removed the -check. - -Original patch from Shaohua Li <shaohua.li@intel.com> against kernel -version 2.6.19rc rewritten by me for kernel 2.6.18. - -Acked-by: Bernhard Walle <bwalle@suse.de> - ---- linux-2.6.18.orig/arch/i386/kernel/microcode.c 2006-09-20 05:42:06.000000000 +0200 -+++ linux-2.6.18/arch/i386/kernel/microcode.c 2006-11-14 14:37:01.000000000 +0100 -@@ -250,14 +250,14 @@ static int find_matching_ucodes (void) - } - - total_size = get_totalsize(&mc_header); -- if ((cursor + total_size > user_buffer_size) || (total_size < DEFAULT_UCODE_TOTALSIZE)) { -+ if (cursor + total_size > user_buffer_size) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EINVAL; - goto out; - } - - data_size = get_datasize(&mc_header); -- if ((data_size + MC_HEADER_SIZE > total_size) || (data_size < DEFAULT_UCODE_DATASIZE)) { -+ if (data_size + MC_HEADER_SIZE > total_size) { - printk(KERN_ERR "microcode: error! Bad data in microcode data file\n"); - error = -EINVAL; - goto out; -@@ -460,11 +460,6 @@ static ssize_t microcode_write (struct f - { - ssize_t ret; - -- if (len < DEFAULT_UCODE_TOTALSIZE) { -- printk(KERN_ERR "microcode: not enough data\n"); -- return -EINVAL; -- } -- - if ((len >> PAGE_SHIFT) > num_physpages) { - printk(KERN_ERR "microcode: too much data (max %ld pages)\n", num_physpages); - return -EINVAL; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-iseries-rd_size.patch new/patches.arch/ppc-iseries-rd_size.patch --- old/patches.arch/ppc-iseries-rd_size.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.arch/ppc-iseries-rd_size.patch 2006-12-09 14:22:22.000000000 +0100 @@ -0,0 +1,23 @@ +Subject: fix compile error +From: olh@suse.de + +--- + arch/powerpc/platforms/iseries/setup.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: linux-2.6.18/arch/powerpc/platforms/iseries/setup.c +=================================================================== +--- linux-2.6.18.orig/arch/powerpc/platforms/iseries/setup.c ++++ linux-2.6.18/arch/powerpc/platforms/iseries/setup.c +@@ -303,9 +303,11 @@ static void __init iSeries_init_early(vo + initrd_start = (unsigned long)__va(naca.xRamDisk); + initrd_end = initrd_start + naca.xRamDiskSize * HW_PAGE_SIZE; + initrd_below_start_ok = 1; // ramdisk in kernel space ++#if defined(CONFIG_BLK_DEV_RAM) + ROOT_DEV = Root_RAM0; + if (((rd_size * 1024) / HW_PAGE_SIZE) < naca.xRamDiskSize) + rd_size = (naca.xRamDiskSize * HW_PAGE_SIZE) / 1024; ++#endif + } else + #endif /* CONFIG_BLK_DEV_INITRD */ + { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-uaccess-fix new/patches.arch/s390-uaccess-fix --- old/patches.arch/s390-uaccess-fix 2006-11-22 13:21:46.000000000 +0100 +++ new/patches.arch/s390-uaccess-fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -Date: Wed, 15 Nov 2006 18:43:33 -0800 -Subject: S390: user readable uninitialised kernel memory -From: Martin Schwidefsky <schwidefsky@de.ibm.com> -Patch-Mainline: Yes - -The previous patch to correct the copy_from_user padding is quite -broken. The execute instruction needs to be done via the register %r4, -not via %r2 and 31 bit doesn't know the instructions lgr and ahji. - -Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> -Signed-off-by: Chris Wright <chrisw@sous-sol.org> -Signed-off-by: Hannes Reinecke <hare@suse.de> - ---- - arch/s390/lib/uaccess.S | 10 +++++----- - arch/s390/lib/uaccess64.S | 2 +- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- linux-2.6.18.2.orig/arch/s390/lib/uaccess64.S -+++ linux-2.6.18.2/arch/s390/lib/uaccess64.S -@@ -49,7 +49,7 @@ __copy_from_user_asm: - la %r2,256(%r2) - 8: aghi %r5,-256 - jnm 7b -- ex %r5,0(%r2) -+ ex %r5,0(%r4) - 9: lgr %r2,%r3 - br %r14 - .section __ex_table,"a" ---- linux-2.6.18.2.orig/arch/s390/lib/uaccess.S -+++ linux-2.6.18.2/arch/s390/lib/uaccess.S -@@ -41,15 +41,15 @@ __copy_from_user_asm: - 5: mvcp 0(%r5,%r2),0(%r4),%r0 - slr %r3,%r5 - alr %r2,%r5 --6: lgr %r5,%r3 # copy remaining size -+6: lr %r5,%r3 # copy remaining size - ahi %r5,-1 # subtract 1 for xc loop - bras %r4,8f -- xc 0(1,%2),0(%2) --7: xc 0(256,%2),0(%2) -+ xc 0(1,%r2),0(%r2) -+7: xc 0(256,%r2),0(%r2) - la %r2,256(%r2) --8: ahji %r5,-256 -+8: ahi %r5,-256 - jnm 7b -- ex %r5,0(%r2) -+ ex %r5,0(%r4) - 9: lr %r2,%r3 - br %r14 - .section __ex_table,"a" - --- ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0027-ahci-preserve-PORTS_IMPL-over-host-resets.txt new/patches.drivers/0027-ahci-preserve-PORTS_IMPL-over-host-resets.txt --- old/patches.drivers/0027-ahci-preserve-PORTS_IMPL-over-host-resets.txt 2006-11-27 10:18:46.000000000 +0100 +++ new/patches.drivers/0027-ahci-preserve-PORTS_IMPL-over-host-resets.txt 2006-12-02 12:24:02.000000000 +0100 @@ -12,13 +12,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/ahci.c | 23 ++++++++++++++++++++--- - 1 file changed, 20 insertions(+), 3 deletions(-) + 1 files changed, 20 insertions(+), 3 deletions(-) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -352,6 +352,11 @@ static struct pci_driver ahci_pci_driver +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -354,6 +354,11 @@ static struct pci_driver ahci_pci_driver }; @@ -30,7 +28,7 @@ static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int port) { return base + 0x100 + (port * 0x80); -@@ -561,11 +566,12 @@ static int ahci_deinit_port(void __iomem +@@ -563,11 +568,12 @@ static int ahci_deinit_port(void __iomem static int ahci_reset_controller(void __iomem *mmio, struct pci_dev *pdev) { @@ -44,7 +42,7 @@ /* global controller reset */ tmp = readl(mmio + HOST_CTL); -@@ -586,10 +592,21 @@ static int ahci_reset_controller(void __ +@@ -588,10 +594,21 @@ static int ahci_reset_controller(void __ return -EIO; } @@ -67,7 +65,7 @@ (void) readl(mmio + HOST_PORTS_IMPL); /* flush */ if (pdev->vendor == PCI_VENDOR_ID_INTEL) { -@@ -1353,7 +1370,7 @@ static int ahci_host_init(struct ata_pro +@@ -1367,7 +1384,7 @@ static int ahci_host_init(struct ata_pro hpriv->cap = readl(mmio + HOST_CAP); hpriv->port_map = readl(mmio + HOST_PORTS_IMPL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0028-ahci-honor-PORTS_IMPL-on-ICH8s.txt new/patches.drivers/0028-ahci-honor-PORTS_IMPL-on-ICH8s.txt --- old/patches.drivers/0028-ahci-honor-PORTS_IMPL-on-ICH8s.txt 2006-11-27 10:46:55.000000000 +0100 +++ new/patches.drivers/0028-ahci-honor-PORTS_IMPL-on-ICH8s.txt 2006-12-02 12:24:02.000000000 +0100 @@ -18,12 +18,10 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/ahci.c | 71 +++++++++++++++++++++++++++++++++++++++++------------ - 1 file changed, 55 insertions(+), 16 deletions(-) + 1 files changed, 55 insertions(+), 16 deletions(-) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c @@ -53,6 +53,7 @@ enum { @@ -42,7 +40,7 @@ /* global controller registers */ HOST_CAP = 0x00, /* host capabilities */ -@@ -167,6 +169,7 @@ enum { +@@ -168,6 +170,7 @@ enum { /* ap->flags bits */ AHCI_FLAG_RESET_NEEDS_CLO = (1 << 24), AHCI_FLAG_NO_NCQ = (1 << 25), @@ -50,7 +48,7 @@ }; struct ahci_cmd_hdr { -@@ -283,6 +286,16 @@ static const struct ata_port_info ahci_p +@@ -284,6 +287,16 @@ static const struct ata_port_info ahci_p .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &ahci_ops, }, @@ -67,7 +65,7 @@ /* board_ahci_vt8251 */ { .sht = &ahci_sht, -@@ -307,11 +320,11 @@ static const struct pci_device_id ahci_p +@@ -309,11 +322,11 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x2682), board_ahci }, /* ESB2 */ { PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */ { PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */ @@ -84,7 +82,7 @@ /* JMicron */ { PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */ -@@ -622,7 +635,8 @@ static int ahci_reset_controller(void __ +@@ -624,7 +637,8 @@ static int ahci_reset_controller(void __ } static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev, @@ -94,7 +92,7 @@ { int i, rc; u32 tmp; -@@ -631,13 +645,12 @@ static void ahci_init_controller(void __ +@@ -633,13 +647,12 @@ static void ahci_init_controller(void __ void __iomem *port_mmio = ahci_port_base(mmio, i); const char *emsg = NULL; @@ -111,7 +109,7 @@ if (rc) dev_printk(KERN_WARNING, &pdev->dev, "%s (%d)\n", emsg, rc); -@@ -1249,7 +1262,8 @@ static int ahci_pci_device_resume(struct +@@ -1263,7 +1276,8 @@ static int ahci_pci_device_resume(struct if (rc) return rc; @@ -121,7 +119,7 @@ } ata_host_resume(host); -@@ -1361,7 +1375,7 @@ static int ahci_host_init(struct ata_pro +@@ -1375,7 +1389,7 @@ static int ahci_host_init(struct ata_pro struct ahci_host_priv *hpriv = probe_ent->private_data; struct pci_dev *pdev = to_pci_dev(probe_ent->dev); void __iomem *mmio = probe_ent->mmio_base; @@ -130,7 +128,7 @@ int rc; rc = ahci_reset_controller(mmio, pdev); -@@ -1370,10 +1384,34 @@ static int ahci_host_init(struct ata_pro +@@ -1384,10 +1398,34 @@ static int ahci_host_init(struct ata_pro hpriv->cap = readl(mmio + HOST_CAP); hpriv->port_map = readl(mmio + HOST_PORTS_IMPL); @@ -167,7 +165,7 @@ using_dac = hpriv->cap & HOST_CAP_64; if (using_dac && -@@ -1405,7 +1443,8 @@ static int ahci_host_init(struct ata_pro +@@ -1419,7 +1457,8 @@ static int ahci_host_init(struct ata_pro for (i = 0; i < probe_ent->n_ports; i++) ahci_setup_port(&probe_ent->port[i], (unsigned long) mmio, i); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0029-libata-separate-out-and-export-sata_port_hardreset.txt new/patches.drivers/0029-libata-separate-out-and-export-sata_port_hardreset.txt --- old/patches.drivers/0029-libata-separate-out-and-export-sata_port_hardreset.txt 2006-11-27 11:24:24.000000000 +0100 +++ new/patches.drivers/0029-libata-separate-out-and-export-sata_port_hardreset.txt 2006-12-02 12:24:02.000000000 +0100 @@ -13,11 +13,9 @@ include/linux/libata.h | 2 + 2 files changed, 44 insertions(+), 10 deletions(-) -Index: suse-kotd/drivers/ata/libata-core.c -=================================================================== ---- suse-kotd.orig/drivers/ata/libata-core.c -+++ suse-kotd/drivers/ata/libata-core.c -@@ -2890,9 +2890,9 @@ int ata_std_softreset(struct ata_port *a +--- linux-2.6.18.orig/drivers/ata/libata-core.c ++++ linux-2.6.18/drivers/ata/libata-core.c +@@ -2836,9 +2836,9 @@ int ata_std_softreset(struct ata_port *a } /** @@ -29,7 +27,7 @@ * * SATA phy-reset host port using DET bits of SControl register. * -@@ -2902,10 +2902,8 @@ int ata_std_softreset(struct ata_port *a +@@ -2848,10 +2848,8 @@ int ata_std_softreset(struct ata_port *a * RETURNS: * 0 on success, -errno otherwise. */ @@ -41,7 +39,7 @@ u32 scontrol; int rc; -@@ -2918,24 +2916,24 @@ int sata_std_hardreset(struct ata_port * +@@ -2864,24 +2862,24 @@ int sata_std_hardreset(struct ata_port * * and Sil3124. */ if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) @@ -70,7 +68,7 @@ /* Couldn't find anything in SATA I/II specs, but AHCI-1.1 * 10.4.2 says at least 1 ms. -@@ -2943,7 +2941,40 @@ int sata_std_hardreset(struct ata_port * +@@ -2889,7 +2887,40 @@ int sata_std_hardreset(struct ata_port * msleep(1); /* bring phy back */ @@ -112,7 +110,7 @@ /* TODO: phy layer with polling, timeouts, etc. */ if (ata_port_offline(ap)) { -@@ -6286,6 +6317,7 @@ EXPORT_SYMBOL_GPL(__sata_phy_reset); +@@ -6220,6 +6251,7 @@ EXPORT_SYMBOL_GPL(__sata_phy_reset); EXPORT_SYMBOL_GPL(ata_bus_reset); EXPORT_SYMBOL_GPL(ata_std_prereset); EXPORT_SYMBOL_GPL(ata_std_softreset); @@ -120,11 +118,9 @@ EXPORT_SYMBOL_GPL(sata_std_hardreset); EXPORT_SYMBOL_GPL(ata_std_postreset); EXPORT_SYMBOL_GPL(ata_dev_classify); -Index: suse-kotd/include/linux/libata.h -=================================================================== ---- suse-kotd.orig/include/linux/libata.h -+++ suse-kotd/include/linux/libata.h -@@ -741,6 +741,8 @@ extern int sata_phy_debounce(struct ata_ +--- linux-2.6.18.orig/include/linux/libata.h ++++ linux-2.6.18/include/linux/libata.h +@@ -738,6 +738,8 @@ extern int sata_phy_debounce(struct ata_ extern int sata_phy_resume(struct ata_port *ap, const unsigned long *param); extern int ata_std_prereset(struct ata_port *ap); extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0030-ahci-update-ahci-vt8251-reset-sequence.txt new/patches.drivers/0030-ahci-update-ahci-vt8251-reset-sequence.txt --- old/patches.drivers/0030-ahci-update-ahci-vt8251-reset-sequence.txt 2006-11-27 11:13:37.000000000 +0100 +++ new/patches.drivers/0030-ahci-update-ahci-vt8251-reset-sequence.txt 2006-12-02 12:24:02.000000000 +0100 @@ -19,13 +19,11 @@ Signed-off-by: Jeff Garzik <jeff@garzik.org> --- drivers/ata/ahci.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 76 insertions(+), 2 deletions(-) + 1 files changed, 76 insertions(+), 2 deletions(-) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -216,6 +216,7 @@ static u8 ahci_check_status(struct ata_p +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -217,6 +217,7 @@ static u8 ahci_check_status(struct ata_p static void ahci_freeze(struct ata_port *ap); static void ahci_thaw(struct ata_port *ap); static void ahci_error_handler(struct ata_port *ap); @@ -33,7 +31,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc); static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg); static int ahci_port_resume(struct ata_port *ap); -@@ -275,6 +276,37 @@ static const struct ata_port_operations +@@ -276,6 +277,37 @@ static const struct ata_port_operations .port_stop = ahci_port_stop, }; @@ -71,7 +69,7 @@ static const struct ata_port_info ahci_port_info[] = { /* board_ahci */ { -@@ -301,10 +333,11 @@ static const struct ata_port_info ahci_p +@@ -303,10 +335,11 @@ static const struct ata_port_info ahci_p .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_SKIP_D2H_BSY | @@ -85,7 +83,7 @@ }, }; -@@ -862,6 +895,31 @@ static int ahci_hardreset(struct ata_por +@@ -876,6 +909,31 @@ static int ahci_hardreset(struct ata_por return rc; } @@ -117,7 +115,7 @@ static void ahci_postreset(struct ata_port *ap, unsigned int *class) { void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr; -@@ -1181,6 +1239,22 @@ static void ahci_error_handler(struct at +@@ -1195,6 +1253,22 @@ static void ahci_error_handler(struct at ahci_postreset); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0031-ahci-do-not-powerdown-during-initialization.txt new/patches.drivers/0031-ahci-do-not-powerdown-during-initialization.txt --- old/patches.drivers/0031-ahci-do-not-powerdown-during-initialization.txt 2006-11-27 10:20:14.000000000 +0100 +++ new/patches.drivers/0031-ahci-do-not-powerdown-during-initialization.txt 2006-12-02 12:24:02.000000000 +0100 @@ -35,13 +35,11 @@ --- drivers/ata/ahci.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) + 1 files changed, 7 insertions(+), 7 deletions(-) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -576,9 +576,6 @@ static void ahci_power_down(void __iomem +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -578,9 +578,6 @@ static void ahci_power_down(void __iomem static void ahci_init_port(void __iomem *port_mmio, u32 cap, dma_addr_t cmd_slot_dma, dma_addr_t rx_fis_dma) { @@ -51,7 +49,7 @@ /* enable FIS reception */ ahci_start_fis_rx(port_mmio, cap, cmd_slot_dma, rx_fis_dma); -@@ -604,9 +601,6 @@ static int ahci_deinit_port(void __iomem +@@ -606,9 +603,6 @@ static int ahci_deinit_port(void __iomem return rc; } @@ -61,7 +59,7 @@ return 0; } -@@ -1281,7 +1275,9 @@ static int ahci_port_suspend(struct ata_ +@@ -1295,7 +1289,9 @@ static int ahci_port_suspend(struct ata_ int rc; rc = ahci_deinit_port(port_mmio, hpriv->cap, &emsg); @@ -72,7 +70,7 @@ ata_port_printk(ap, KERN_ERR, "%s (%d)\n", emsg, rc); ahci_init_port(port_mmio, hpriv->cap, pp->cmd_slot_dma, pp->rx_fis_dma); -@@ -1297,6 +1293,7 @@ static int ahci_port_resume(struct ata_p +@@ -1311,6 +1307,7 @@ static int ahci_port_resume(struct ata_p void __iomem *mmio = ap->host->mmio_base; void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no); @@ -80,7 +78,7 @@ ahci_init_port(port_mmio, hpriv->cap, pp->cmd_slot_dma, pp->rx_fis_dma); return 0; -@@ -1403,6 +1400,9 @@ static int ahci_port_start(struct ata_po +@@ -1417,6 +1414,9 @@ static int ahci_port_start(struct ata_po ap->private_data = pp; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0032-ahci-ignore-PORT_IRQ_IF_ERR-on-JMB-controllers.txt new/patches.drivers/0032-ahci-ignore-PORT_IRQ_IF_ERR-on-JMB-controllers.txt --- old/patches.drivers/0032-ahci-ignore-PORT_IRQ_IF_ERR-on-JMB-controllers.txt 2006-11-27 10:50:04.000000000 +0100 +++ new/patches.drivers/0032-ahci-ignore-PORT_IRQ_IF_ERR-on-JMB-controllers.txt 2006-12-02 12:24:02.000000000 +0100 @@ -17,12 +17,10 @@ --- drivers/ata/ahci.c | 27 ++++++++++++++++++++++----- - 1 file changed, 22 insertions(+), 5 deletions(-) + 1 files changed, 22 insertions(+), 5 deletions(-) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c @@ -80,6 +80,7 @@ enum { board_ahci = 0, board_ahci_pi = 1, @@ -31,7 +29,7 @@ /* global controller registers */ HOST_CAP = 0x00, /* host capabilities */ -@@ -170,6 +171,7 @@ enum { +@@ -171,6 +172,7 @@ enum { AHCI_FLAG_RESET_NEEDS_CLO = (1 << 24), AHCI_FLAG_NO_NCQ = (1 << 25), AHCI_FLAG_HONOR_PI = (1 << 26), /* honor PORTS_IMPL */ @@ -39,7 +37,7 @@ }; struct ahci_cmd_hdr { -@@ -339,6 +341,17 @@ static const struct ata_port_info ahci_p +@@ -341,6 +343,17 @@ static const struct ata_port_info ahci_p .udma_mask = 0x7f, /* udma0-6 ; FIXME */ .port_ops = &ahci_vt8251_ops, }, @@ -57,7 +55,7 @@ }; static const struct pci_device_id ahci_pci_tbl[] = { -@@ -360,11 +373,11 @@ static const struct pci_device_id ahci_p +@@ -362,11 +375,11 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x282a), board_ahci_pi }, /* ICH8M */ /* JMicron */ @@ -74,7 +72,7 @@ /* ATI */ { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */ -@@ -1030,6 +1043,10 @@ static void ahci_error_intr(struct ata_p +@@ -1044,6 +1057,10 @@ static void ahci_error_intr(struct ata_p /* analyze @irq_stat */ ata_ehi_push_desc(ehi, "irq_stat 0x%08x", irq_stat); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt new/patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt --- old/patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt 2006-12-01 12:05:24.000000000 +0100 @@ -0,0 +1,97 @@ +From c6446a4cdadaf411bafe1565e9fa7666f3c2fe95 Mon Sep 17 00:00:00 2001 +From: Tejun Heo <htejun@gmail.com> +Date: Mon, 9 Oct 2006 13:23:58 +0900 +Subject: [PATCH] ata_piix: allow 01b MAP for both ICH6M and ICH7M + +ICH7M was separated from ICH6M to allow undocumented MAP value 01b +which was spotted on an ASUS notebook. However, there is also +notebooks with MAP value 01b on ICH6M. This patch re-merges ICH6M and +ICH7M entries and allows MAP value 01b for both. + +This problem has been reported and initial patch provided by Jonathan +Dieter. + +Signed-off-by: Tejun Heo <htejun@gmail.com> +Cc: Jonathan Dieter <jdieter@gmail.com> +Cc: Tom Deblauwe <tom.deblauwe@telenet.be> +Signed-off-by: Jeff Garzik <jeff@garzik.org> +--- + drivers/ata/ata_piix.c | 35 +++++------------------------------ + 1 file changed, 5 insertions(+), 30 deletions(-) + +Index: suse-kotd/drivers/ata/ata_piix.c +=================================================================== +--- suse-kotd.orig/drivers/ata/ata_piix.c ++++ suse-kotd/drivers/ata/ata_piix.c +@@ -128,8 +128,7 @@ enum { + ich6_sata = 6, + ich6_sata_ahci = 7, + ich6m_sata_ahci = 8, +- ich7m_sata_ahci = 9, +- ich8_sata_ahci = 10, ++ ich8_sata_ahci = 9, + + /* constants for mapping table */ + P0 = 0, /* port 0 */ +@@ -227,7 +226,7 @@ static const struct pci_device_id piix_p + /* 82801GB/GR/GH (ICH7, identical to ICH6) */ + { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, + /* 2801GBM/GHM (ICH7M, identical to ICH6M) */ +- { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7m_sata_ahci }, ++ { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata_ahci }, + /* Enterprise Southbridge 2 (where's the datasheet?) */ + { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, + /* SATA Controller 1 IDE (ICH8, no datasheet yet) */ +@@ -396,22 +395,10 @@ static const struct piix_map_db ich6_map + static const struct piix_map_db ich6m_map_db = { + .mask = 0x3, + .port_enable = 0x5, +- .map = { +- /* PM PS SM SS MAP */ +- { P0, P2, RV, RV }, /* 00b */ +- { RV, RV, RV, RV }, +- { P0, P2, IDE, IDE }, /* 10b */ +- { RV, RV, RV, RV }, +- }, +-}; +- +-static const struct piix_map_db ich7m_map_db = { +- .mask = 0x3, +- .port_enable = 0x5, + + /* Map 01b isn't specified in the doc but some notebooks use +- * it anyway. ATM, the only case spotted carries subsystem ID +- * 1025:0107. This is the only difference from ich6m. ++ * it anyway. MAP 01b have been spotted on both ICH6M and ++ * ICH7M. + */ + .map = { + /* PM PS SM SS MAP */ +@@ -439,7 +426,6 @@ static const struct piix_map_db *piix_ma + [ich6_sata] = &ich6_map_db, + [ich6_sata_ahci] = &ich6_map_db, + [ich6m_sata_ahci] = &ich6m_map_db, +- [ich7m_sata_ahci] = &ich7m_map_db, + [ich8_sata_ahci] = &ich8_map_db, + }; + +@@ -535,18 +521,7 @@ static struct ata_port_info piix_port_in + .port_ops = &piix_sata_ops, + }, + +- /* ich7m_sata_ahci: 9 */ +- { +- .sht = &piix_sht, +- .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR | +- PIIX_FLAG_AHCI, +- .pio_mask = 0x1f, /* pio0-4 */ +- .mwdma_mask = 0x07, /* mwdma0-2 */ +- .udma_mask = 0x7f, /* udma0-6 */ +- .port_ops = &piix_sata_ops, +- }, +- +- /* ich8_sata_ahci: 10 */ ++ /* ich8_sata_ahci: 9 */ + { + .sht = &piix_sht, + .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR | diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0041-libata-fix-scsi_host_template-in-drivers.txt new/patches.drivers/0041-libata-fix-scsi_host_template-in-drivers.txt --- old/patches.drivers/0041-libata-fix-scsi_host_template-in-drivers.txt 2006-11-27 10:21:09.000000000 +0100 +++ new/patches.drivers/0041-libata-fix-scsi_host_template-in-drivers.txt 2006-12-02 12:24:02.000000000 +0100 @@ -55,10 +55,8 @@ drivers/ata/pata_winbond.c | 2 +- 40 files changed, 40 insertions(+), 46 deletions(-) -Index: suse-kotd/drivers/ata/ata_generic.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ata_generic.c -+++ suse-kotd/drivers/ata/ata_generic.c +--- linux-2.6.18.orig/drivers/ata/ata_generic.c ++++ linux-2.6.18/drivers/ata/ata_generic.c @@ -109,13 +109,13 @@ static struct scsi_host_template generic .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -74,10 +72,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_ali.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_ali.c -+++ suse-kotd/drivers/ata/pata_ali.c +--- linux-2.6.18.orig/drivers/ata/pata_ali.c ++++ linux-2.6.18/drivers/ata/pata_ali.c @@ -337,15 +337,13 @@ static struct scsi_host_template ali_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -95,10 +91,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_amd.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_amd.c -+++ suse-kotd/drivers/ata/pata_amd.c +--- linux-2.6.18.orig/drivers/ata/pata_amd.c ++++ linux-2.6.18/drivers/ata/pata_amd.c @@ -326,13 +326,13 @@ static struct scsi_host_template amd_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -114,10 +108,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_artop.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_artop.c -+++ suse-kotd/drivers/ata/pata_artop.c +--- linux-2.6.18.orig/drivers/ata/pata_artop.c ++++ linux-2.6.18/drivers/ata/pata_artop.c @@ -307,13 +307,13 @@ static struct scsi_host_template artop_s .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -133,10 +125,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_atiixp.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_atiixp.c -+++ suse-kotd/drivers/ata/pata_atiixp.c +--- linux-2.6.18.orig/drivers/ata/pata_atiixp.c ++++ linux-2.6.18/drivers/ata/pata_atiixp.c @@ -209,13 +209,13 @@ static struct scsi_host_template atiixp_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -152,10 +142,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_cmd64x.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_cmd64x.c -+++ suse-kotd/drivers/ata/pata_cmd64x.c +--- linux-2.6.18.orig/drivers/ata/pata_cmd64x.c ++++ linux-2.6.18/drivers/ata/pata_cmd64x.c @@ -268,13 +268,13 @@ static struct scsi_host_template cmd64x_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -171,10 +159,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_cs5520.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_cs5520.c -+++ suse-kotd/drivers/ata/pata_cs5520.c +--- linux-2.6.18.orig/drivers/ata/pata_cs5520.c ++++ linux-2.6.18/drivers/ata/pata_cs5520.c @@ -159,13 +159,13 @@ static struct scsi_host_template cs5520_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -190,10 +176,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_cs5530.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_cs5530.c -+++ suse-kotd/drivers/ata/pata_cs5530.c +--- linux-2.6.18.orig/drivers/ata/pata_cs5530.c ++++ linux-2.6.18/drivers/ata/pata_cs5530.c @@ -173,13 +173,13 @@ static struct scsi_host_template cs5530_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -209,10 +193,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_cs5535.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_cs5535.c -+++ suse-kotd/drivers/ata/pata_cs5535.c +--- linux-2.6.18.orig/drivers/ata/pata_cs5535.c ++++ linux-2.6.18/drivers/ata/pata_cs5535.c @@ -177,13 +177,13 @@ static struct scsi_host_template cs5535_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -228,10 +210,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_cypress.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_cypress.c -+++ suse-kotd/drivers/ata/pata_cypress.c +--- linux-2.6.18.orig/drivers/ata/pata_cypress.c ++++ linux-2.6.18/drivers/ata/pata_cypress.c @@ -128,13 +128,13 @@ static struct scsi_host_template cy82c69 .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -247,10 +227,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_efar.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_efar.c -+++ suse-kotd/drivers/ata/pata_efar.c +--- linux-2.6.18.orig/drivers/ata/pata_efar.c ++++ linux-2.6.18/drivers/ata/pata_efar.c @@ -226,13 +226,13 @@ static struct scsi_host_template efar_sh .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -266,10 +244,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_hpt366.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_hpt366.c -+++ suse-kotd/drivers/ata/pata_hpt366.c +--- linux-2.6.18.orig/drivers/ata/pata_hpt366.c ++++ linux-2.6.18/drivers/ata/pata_hpt366.c @@ -322,13 +322,13 @@ static struct scsi_host_template hpt36x_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -285,11 +261,9 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_hpt37x.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_hpt37x.c -+++ suse-kotd/drivers/ata/pata_hpt37x.c -@@ -768,13 +768,13 @@ static struct scsi_host_template hpt37x_ +--- linux-2.6.18.orig/drivers/ata/pata_hpt37x.c ++++ linux-2.6.18/drivers/ata/pata_hpt37x.c +@@ -755,13 +755,13 @@ static struct scsi_host_template hpt37x_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, @@ -304,10 +278,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_hpt3x2n.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_hpt3x2n.c -+++ suse-kotd/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.18.orig/drivers/ata/pata_hpt3x2n.c ++++ linux-2.6.18/drivers/ata/pata_hpt3x2n.c @@ -334,13 +334,13 @@ static struct scsi_host_template hpt3x2n .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -323,10 +295,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_hpt3x3.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_hpt3x3.c -+++ suse-kotd/drivers/ata/pata_hpt3x3.c +--- linux-2.6.18.orig/drivers/ata/pata_hpt3x3.c ++++ linux-2.6.18/drivers/ata/pata_hpt3x3.c @@ -111,13 +111,13 @@ static struct scsi_host_template hpt3x3_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -342,10 +312,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_isapnp.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_isapnp.c -+++ suse-kotd/drivers/ata/pata_isapnp.c +--- linux-2.6.18.orig/drivers/ata/pata_isapnp.c ++++ linux-2.6.18/drivers/ata/pata_isapnp.c @@ -27,13 +27,13 @@ static struct scsi_host_template isapnp_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -361,10 +329,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_it821x.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_it821x.c -+++ suse-kotd/drivers/ata/pata_it821x.c +--- linux-2.6.18.orig/drivers/ata/pata_it821x.c ++++ linux-2.6.18/drivers/ata/pata_it821x.c @@ -666,15 +666,13 @@ static struct scsi_host_template it821x_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -382,10 +348,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_jmicron.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_jmicron.c -+++ suse-kotd/drivers/ata/pata_jmicron.c +--- linux-2.6.18.orig/drivers/ata/pata_jmicron.c ++++ linux-2.6.18/drivers/ata/pata_jmicron.c @@ -128,14 +128,13 @@ static struct scsi_host_template jmicron .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -402,10 +366,8 @@ /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_legacy.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_legacy.c -+++ suse-kotd/drivers/ata/pata_legacy.c +--- linux-2.6.18.orig/drivers/ata/pata_legacy.c ++++ linux-2.6.18/drivers/ata/pata_legacy.c @@ -128,13 +128,13 @@ static struct scsi_host_template legacy_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -421,11 +383,9 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_marvell.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_marvell.c -+++ suse-kotd/drivers/ata/pata_marvell.c -@@ -94,13 +94,13 @@ static struct scsi_host_template marvell +--- linux-2.6.18.orig/drivers/ata/pata_marvell.c ++++ linux-2.6.18/drivers/ata/pata_marvell.c +@@ -92,13 +92,13 @@ static struct scsi_host_template marvell .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, @@ -440,10 +400,8 @@ /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_mpiix.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_mpiix.c -+++ suse-kotd/drivers/ata/pata_mpiix.c +--- linux-2.6.18.orig/drivers/ata/pata_mpiix.c ++++ linux-2.6.18/drivers/ata/pata_mpiix.c @@ -159,13 +159,13 @@ static struct scsi_host_template mpiix_s .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -459,10 +417,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_netcell.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_netcell.c -+++ suse-kotd/drivers/ata/pata_netcell.c +--- linux-2.6.18.orig/drivers/ata/pata_netcell.c ++++ linux-2.6.18/drivers/ata/pata_netcell.c @@ -54,14 +54,13 @@ static struct scsi_host_template netcell .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -479,10 +435,8 @@ /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_ns87410.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_ns87410.c -+++ suse-kotd/drivers/ata/pata_ns87410.c +--- linux-2.6.18.orig/drivers/ata/pata_ns87410.c ++++ linux-2.6.18/drivers/ata/pata_ns87410.c @@ -149,13 +149,13 @@ static struct scsi_host_template ns87410 .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -498,10 +452,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_oldpiix.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_oldpiix.c -+++ suse-kotd/drivers/ata/pata_oldpiix.c +--- linux-2.6.18.orig/drivers/ata/pata_oldpiix.c ++++ linux-2.6.18/drivers/ata/pata_oldpiix.c @@ -224,13 +224,13 @@ static struct scsi_host_template oldpiix .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -517,10 +469,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_opti.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_opti.c -+++ suse-kotd/drivers/ata/pata_opti.c +--- linux-2.6.18.orig/drivers/ata/pata_opti.c ++++ linux-2.6.18/drivers/ata/pata_opti.c @@ -195,13 +195,13 @@ static struct scsi_host_template opti_sh .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -536,10 +486,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_optidma.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_optidma.c -+++ suse-kotd/drivers/ata/pata_optidma.c +--- linux-2.6.18.orig/drivers/ata/pata_optidma.c ++++ linux-2.6.18/drivers/ata/pata_optidma.c @@ -352,13 +352,13 @@ static struct scsi_host_template optidma .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -555,10 +503,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_pcmcia.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_pcmcia.c -+++ suse-kotd/drivers/ata/pata_pcmcia.c +--- linux-2.6.18.orig/drivers/ata/pata_pcmcia.c ++++ linux-2.6.18/drivers/ata/pata_pcmcia.c @@ -62,13 +62,13 @@ static struct scsi_host_template pcmcia_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -574,10 +520,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_pdc2027x.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_pdc2027x.c -+++ suse-kotd/drivers/ata/pata_pdc2027x.c +--- linux-2.6.18.orig/drivers/ata/pata_pdc2027x.c ++++ linux-2.6.18/drivers/ata/pata_pdc2027x.c @@ -134,13 +134,13 @@ static struct scsi_host_template pdc2027 .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -593,11 +537,9 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_pdc202xx_old.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_pdc202xx_old.c -+++ suse-kotd/drivers/ata/pata_pdc202xx_old.c -@@ -262,13 +262,13 @@ static struct scsi_host_template pdc202x +--- linux-2.6.18.orig/drivers/ata/pata_pdc202xx_old.c ++++ linux-2.6.18/drivers/ata/pata_pdc202xx_old.c +@@ -262,13 +262,13 @@ static struct scsi_host_template pdc_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, @@ -612,10 +554,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_qdi.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_qdi.c -+++ suse-kotd/drivers/ata/pata_qdi.c +--- linux-2.6.18.orig/drivers/ata/pata_qdi.c ++++ linux-2.6.18/drivers/ata/pata_qdi.c @@ -157,13 +157,13 @@ static struct scsi_host_template qdi_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -631,10 +571,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_radisys.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_radisys.c -+++ suse-kotd/drivers/ata/pata_radisys.c +--- linux-2.6.18.orig/drivers/ata/pata_radisys.c ++++ linux-2.6.18/drivers/ata/pata_radisys.c @@ -220,13 +220,13 @@ static struct scsi_host_template radisys .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -650,10 +588,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_rz1000.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_rz1000.c -+++ suse-kotd/drivers/ata/pata_rz1000.c +--- linux-2.6.18.orig/drivers/ata/pata_rz1000.c ++++ linux-2.6.18/drivers/ata/pata_rz1000.c @@ -83,13 +83,13 @@ static struct scsi_host_template rz1000_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -669,10 +605,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_sc1200.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_sc1200.c -+++ suse-kotd/drivers/ata/pata_sc1200.c +--- linux-2.6.18.orig/drivers/ata/pata_sc1200.c ++++ linux-2.6.18/drivers/ata/pata_sc1200.c @@ -186,13 +186,13 @@ static struct scsi_host_template sc1200_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -688,10 +622,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_serverworks.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_serverworks.c -+++ suse-kotd/drivers/ata/pata_serverworks.c +--- linux-2.6.18.orig/drivers/ata/pata_serverworks.c ++++ linux-2.6.18/drivers/ata/pata_serverworks.c @@ -318,13 +318,13 @@ static struct scsi_host_template serverw .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -707,10 +639,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_sil680.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_sil680.c -+++ suse-kotd/drivers/ata/pata_sil680.c +--- linux-2.6.18.orig/drivers/ata/pata_sil680.c ++++ linux-2.6.18/drivers/ata/pata_sil680.c @@ -218,13 +218,13 @@ static struct scsi_host_template sil680_ .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -726,10 +656,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_sis.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_sis.c -+++ suse-kotd/drivers/ata/pata_sis.c +--- linux-2.6.18.orig/drivers/ata/pata_sis.c ++++ linux-2.6.18/drivers/ata/pata_sis.c @@ -538,13 +538,13 @@ static struct scsi_host_template sis_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -745,10 +673,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_sl82c105.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_sl82c105.c -+++ suse-kotd/drivers/ata/pata_sl82c105.c +--- linux-2.6.18.orig/drivers/ata/pata_sl82c105.c ++++ linux-2.6.18/drivers/ata/pata_sl82c105.c @@ -230,13 +230,13 @@ static struct scsi_host_template sl82c10 .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -764,10 +690,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_triflex.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_triflex.c -+++ suse-kotd/drivers/ata/pata_triflex.c +--- linux-2.6.18.orig/drivers/ata/pata_triflex.c ++++ linux-2.6.18/drivers/ata/pata_triflex.c @@ -185,13 +185,13 @@ static struct scsi_host_template triflex .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, @@ -783,11 +707,9 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_via.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_via.c -+++ suse-kotd/drivers/ata/pata_via.c -@@ -288,13 +288,13 @@ static struct scsi_host_template via_sht +--- linux-2.6.18.orig/drivers/ata/pata_via.c ++++ linux-2.6.18/drivers/ata/pata_via.c +@@ -361,13 +361,13 @@ static struct scsi_host_template via_sht .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, .sg_tablesize = LIBATA_MAX_PRD, @@ -802,10 +724,8 @@ .bios_param = ata_std_bios_param, }; -Index: suse-kotd/drivers/ata/pata_winbond.c -=================================================================== ---- suse-kotd.orig/drivers/ata/pata_winbond.c -+++ suse-kotd/drivers/ata/pata_winbond.c +--- linux-2.6.18.orig/drivers/ata/pata_winbond.c ++++ linux-2.6.18/drivers/ata/pata_winbond.c @@ -126,13 +126,13 @@ static struct scsi_host_template winbond .can_queue = ATA_DEF_QUEUE, .this_id = ATA_SHT_THIS_ID, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0042-ahci-AHCI-mode-SATA-patch-for-Intel-ICH9.txt new/patches.drivers/0042-ahci-AHCI-mode-SATA-patch-for-Intel-ICH9.txt --- old/patches.drivers/0042-ahci-AHCI-mode-SATA-patch-for-Intel-ICH9.txt 2006-11-27 10:21:50.000000000 +0100 +++ new/patches.drivers/0042-ahci-AHCI-mode-SATA-patch-for-Intel-ICH9.txt 2006-12-02 12:24:02.000000000 +0100 @@ -9,13 +9,11 @@ --- drivers/ata/ahci.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) + 1 files changed, 11 insertions(+) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -371,6 +371,17 @@ static const struct pci_device_id ahci_p +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -373,6 +373,17 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(INTEL, 0x2824), board_ahci_pi }, /* ICH8 */ { PCI_VDEVICE(INTEL, 0x2829), board_ahci_pi }, /* ICH8M */ { PCI_VDEVICE(INTEL, 0x282a), board_ahci_pi }, /* ICH8M */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt new/patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt --- old/patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt 2006-11-27 10:58:15.000000000 +0100 +++ new/patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt 2006-12-02 12:24:02.000000000 +0100 @@ -1,10 +1,9 @@ From: Jason Gaston <jason.d.gaston@intel.com> -Subject: ata_piix: IDE mode SATA patch for Intel ICH9 +Subject: [PATCH 2.6.19-rc6][RESEND] ata_piix: IDE mode SATA patch for Intel ICH9 This updated patch adds the Intel ICH9 IDE mode SATA controller DID's. Signed-off-by: Jason Gaston <jason.d.gaston@intel.com> -Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/ata_piix.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) @@ -16,7 +15,7 @@ @@ -227,14 +227,26 @@ static const struct pci_device_id piix_p { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, /* 2801GBM/GHM (ICH7M, identical to ICH6M) */ - { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7m_sata_ahci }, + { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata_ahci }, - /* Enterprise Southbridge 2 (where's the datasheet?) */ + /* Enterprise Southbridge 2 */ { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0044-libata-ahci-Match-PCI-class-code-for-AHCI.txt new/patches.drivers/0044-libata-ahci-Match-PCI-class-code-for-AHCI.txt --- old/patches.drivers/0044-libata-ahci-Match-PCI-class-code-for-AHCI.txt 2006-11-27 10:23:53.000000000 +0100 +++ new/patches.drivers/0044-libata-ahci-Match-PCI-class-code-for-AHCI.txt 2006-12-02 12:24:02.000000000 +0100 @@ -6,13 +6,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/ahci.c | 4 ++++ - 1 file changed, 4 insertions(+) + 1 files changed, 4 insertions(+) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -408,6 +408,10 @@ static const struct pci_device_id ahci_p +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -410,6 +410,10 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 966 */ { PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/0046-libata-Add-support-for-AHCI-controllers-of-MCP67.txt new/patches.drivers/0046-libata-Add-support-for-AHCI-controllers-of-MCP67.txt --- old/patches.drivers/0046-libata-Add-support-for-AHCI-controllers-of-MCP67.txt 2006-11-27 10:24:38.000000000 +0100 +++ new/patches.drivers/0046-libata-Add-support-for-AHCI-controllers-of-MCP67.txt 2006-12-02 12:24:02.000000000 +0100 @@ -7,13 +7,11 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/ata/ahci.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + 1 files changed, 8 insertions(+) -Index: suse-kotd/drivers/ata/ahci.c -=================================================================== ---- suse-kotd.orig/drivers/ata/ahci.c -+++ suse-kotd/drivers/ata/ahci.c -@@ -402,6 +402,14 @@ static const struct pci_device_id ahci_p +--- linux-2.6.18.orig/drivers/ata/ahci.c ++++ linux-2.6.18/drivers/ata/ahci.c +@@ -404,6 +404,14 @@ static const struct pci_device_id ahci_p { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci }, /* MCP65 */ { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci }, /* MCP65 */ { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci }, /* MCP65 */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/965-agp new/patches.drivers/965-agp --- old/patches.drivers/965-agp 2006-11-24 18:34:21.000000000 +0100 +++ new/patches.drivers/965-agp 2006-12-02 12:24:02.000000000 +0100 @@ -12,8 +12,12 @@ Signed-off-by: Dave Jones <davej@redhat.com> --- ---- a/drivers/char/agp/intel-agp.c -+++ b/drivers/char/agp/intel-agp.c +--- + drivers/char/agp/intel-agp.c | 163 ++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 152 insertions(+), 11 deletions(-) + +--- linux-2.6.18.orig/drivers/char/agp/intel-agp.c ++++ linux-2.6.18/drivers/char/agp/intel-agp.c @@ -2,14 +2,6 @@ * Intel AGPGART routines. */ @@ -243,7 +247,7 @@ case PCI_DEVICE_ID_INTEL_7505_0: bridge->driver = &intel_7505_driver; name = "E7505"; -@@ -1827,6 +1964,10 @@ static struct pci_device_id agp_intel_pc +@@ -1825,6 +1962,10 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_82915GM_HB), ID(PCI_DEVICE_ID_INTEL_82945G_HB), ID(PCI_DEVICE_ID_INTEL_82945GM_HB), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/965-agp-suspend new/patches.drivers/965-agp-suspend --- old/patches.drivers/965-agp-suspend 2006-11-24 18:34:21.000000000 +0100 +++ new/patches.drivers/965-agp-suspend 2006-12-02 12:24:02.000000000 +0100 @@ -10,9 +10,13 @@ Signed-off-by: Dave Jones <davej@redhat.com> --- ---- a/drivers/char/agp/intel-agp.c -+++ b/drivers/char/agp/intel-agp.c -@@ -1924,6 +1924,8 @@ static int agp_intel_resume(struct pci_d +--- + drivers/char/agp/intel-agp.c | 2 ++ + 1 files changed, 2 insertions(+) + +--- linux-2.6.18.orig/drivers/char/agp/intel-agp.c ++++ linux-2.6.18/drivers/char/agp/intel-agp.c +@@ -1923,6 +1923,8 @@ static int agp_intel_resume(struct pci_d intel_i830_configure(); else if (bridge->driver == &intel_810_driver) intel_i810_configure(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/agp-dma32 new/patches.drivers/agp-dma32 --- old/patches.drivers/agp-dma32 2006-11-24 18:34:21.000000000 +0100 +++ new/patches.drivers/agp-dma32 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -From: Linus Torvalds <torvalds@woody.osdl.org> -Date: Wed, 22 Nov 2006 22:55:29 +0000 (-0800) -Subject: [AGP] Allocate AGP pages with GFP_DMA32 by default -X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commi... -Acked-by: ak@suse.de - -[AGP] Allocate AGP pages with GFP_DMA32 by default - -Not all graphic page remappers support physical addresses over the 4GB -mark for remapping, so while some do (the AMD64 GART always did, and I -just fixed the i965 to do so properly), we're safest off just forcing -GFP_DMA32 allocations to make sure graphics pages get allocated in the -low 32-bit address space by default. - -AGP sub-drivers that really care, and can do better, could just choose -to implement their own allocator (or we could add another "64-bit safe" -default allocator for their use), but quite frankly, you're not likely -to care in practice. - -So for now, this trivial change means that we won't be allocating pages -that we can't map correctly by mistake on x86-64. - -[ On traditional 32-bit x86, this could never happen, because GFP_KERNEL - would never allocate any highmem memory anyway ] - -Acked-by: Andi Kleen <ak@suse.de> -Acked-by: Dave Jones <davej@redhat.com> -Cc: Eric Anholt <eric@anholt.net> -Cc: Keith Packard <keithp@keithp.com> -Signed-off-by: Linus Torvalds <torvalds@osdl.org> ---- - -Index: linux-2.6.18/drivers/char/agp/generic.c -=================================================================== ---- linux-2.6.18.orig/drivers/char/agp/generic.c -+++ linux-2.6.18/drivers/char/agp/generic.c -@@ -1042,7 +1042,7 @@ void *agp_generic_alloc_page(struct agp_ - { - struct page * page; - -- page = alloc_page(GFP_KERNEL); -+ page = alloc_page(GFP_KERNEL | GFP_DMA32); - if (page == NULL) - return NULL; - -Index: linux-2.6.18/drivers/char/agp/intel-agp.c -=================================================================== ---- linux-2.6.18.orig/drivers/char/agp/intel-agp.c -+++ linux-2.6.18/drivers/char/agp/intel-agp.c -@@ -169,7 +169,7 @@ static void *i8xx_alloc_pages(void) - { - struct page * page; - -- page = alloc_pages(GFP_KERNEL, 2); -+ page = alloc_pages(GFP_KERNEL | GFP_DMA32, 2); - if (page == NULL) - return NULL; - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-fixup-pci-quirks-defines new/patches.drivers/libata-fixup-pci-quirks-defines --- old/patches.drivers/libata-fixup-pci-quirks-defines 2006-11-24 09:06:44.000000000 +0100 +++ new/patches.drivers/libata-fixup-pci-quirks-defines 2006-12-02 12:24:02.000000000 +0100 @@ -14,11 +14,9 @@ drivers/pci/quirks.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index fb08bc9..2d967b4 100644 ---- a/drivers/pci/quirks.c -+++ b/drivers/pci/quirks.c -@@ -1209,7 +1209,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S +--- linux-2.6.18.orig/drivers/pci/quirks.c ++++ linux-2.6.18/drivers/pci/quirks.c +@@ -1202,7 +1202,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_963, quirk_sis_96x_smbus ); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_LPC, quirk_sis_96x_smbus ); @@ -27,7 +25,7 @@ /* * If we are using libata we can drive this chip properly but must -@@ -1299,7 +1299,7 @@ static int __init combined_setup(char *s +@@ -1292,7 +1292,7 @@ static int __init combined_setup(char *s } __setup("combined_mode=", combined_setup); @@ -36,7 +34,7 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) { u8 prog, comb, tmp; -@@ -1392,7 +1392,7 @@ static void __devinit quirk_intel_ide_co +@@ -1385,7 +1385,7 @@ static void __devinit quirk_intel_ide_co request_region(0x170, 8, "libata"); /* port 1 */ } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_ANY_ID, quirk_intel_ide_combined ); @@ -45,6 +43,3 @@ int pcie_mch_quirk; --- -1.4.3.5 - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-flush-ext-workaround new/patches.drivers/libata-flush-ext-workaround --- old/patches.drivers/libata-flush-ext-workaround 2006-11-13 08:52:27.000000000 +0100 +++ new/patches.drivers/libata-flush-ext-workaround 2006-12-02 12:24:02.000000000 +0100 @@ -31,11 +31,15 @@ * In ata_dev_configure(), use dev->n_sectors instead of reading it directly from id. -diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index 9fdb266..e161036 100644 ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -1457,6 +1457,10 @@ int ata_dev_configure(struct ata_device +--- + drivers/ata/libata-core.c | 6 +++++- + drivers/ata/libata-scsi.c | 3 +-- + include/linux/libata.h | 1 + + 3 files changed, 7 insertions(+), 3 deletions(-) + +--- linux-2.6.18.orig/drivers/ata/libata-core.c ++++ linux-2.6.18/drivers/ata/libata-core.c +@@ -1472,6 +1472,10 @@ int ata_dev_configure(struct ata_device if (ata_id_has_lba48(id)) { dev->flags |= ATA_DFLAG_LBA48; lba_desc = "LBA48"; @@ -46,7 +50,7 @@ } /* config NCQ */ -@@ -5128,7 +5132,7 @@ int ata_flush_cache(struct ata_device *d +@@ -5138,7 +5142,7 @@ int ata_flush_cache(struct ata_device *d if (!ata_try_flush_cache(dev)) return 0; @@ -55,11 +59,9 @@ cmd = ATA_CMD_FLUSH_EXT; else cmd = ATA_CMD_FLUSH; -diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c -index a0b6ee1..2be51c6 100644 ---- a/drivers/ata/libata-scsi.c -+++ b/drivers/ata/libata-scsi.c -@@ -1027,8 +1027,7 @@ static unsigned int ata_scsi_flush_xlat( +--- linux-2.6.18.orig/drivers/ata/libata-scsi.c ++++ linux-2.6.18/drivers/ata/libata-scsi.c +@@ -1040,8 +1040,7 @@ static unsigned int ata_scsi_flush_xlat( tf->flags |= ATA_TFLAG_DEVICE; tf->protocol = ATA_PROT_NODATA; @@ -69,11 +71,9 @@ tf->command = ATA_CMD_FLUSH_EXT; else tf->command = ATA_CMD_FLUSH; -diff --git a/include/linux/libata.h b/include/linux/libata.h -index 0d0ddea..36e233c 100644 ---- a/include/linux/libata.h -+++ b/include/linux/libata.h -@@ -140,6 +140,7 @@ enum { +--- linux-2.6.18.orig/include/linux/libata.h ++++ linux-2.6.18/include/linux/libata.h +@@ -160,6 +160,7 @@ enum { ATA_DFLAG_LBA48 = (1 << 1), /* device supports LBA48 */ ATA_DFLAG_CDB_INTR = (1 << 2), /* device asserts INTRQ when ready for CDB */ ATA_DFLAG_NCQ = (1 << 3), /* device supports NCQ */ @@ -81,7 +81,3 @@ ATA_DFLAG_CFG_MASK = (1 << 8) - 1, ATA_DFLAG_PIO = (1 << 8), /* device limited to PIO mode */ -- -To unsubscribe from this list: send the line "unsubscribe linux-ide" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-legacy-irq-share new/patches.drivers/libata-legacy-irq-share --- old/patches.drivers/libata-legacy-irq-share 2006-11-20 11:10:47.000000000 +0100 +++ new/patches.drivers/libata-legacy-irq-share 2006-12-02 12:24:02.000000000 +0100 @@ -17,11 +17,15 @@ Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Hannes Reinecke <hare@suse.de> -diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c -index 94a7771..98232b4 100644 ---- a/drivers/ata/libata-core.c -+++ b/drivers/ata/libata-core.c -@@ -4820,6 +4820,7 @@ unsigned int ata_qc_issue_prot(struct at +--- + drivers/ata/libata-core.c | 11 ++++++++--- + drivers/ata/libata-sff.c | 12 +++++++++--- + drivers/ata/sata_sil.c | 5 +++++ + 3 files changed, 22 insertions(+), 6 deletions(-) + +--- linux-2.6.18.orig/drivers/ata/libata-core.c ++++ linux-2.6.18/drivers/ata/libata-core.c +@@ -4875,6 +4875,7 @@ unsigned int ata_qc_issue_prot(struct at inline unsigned int ata_host_intr (struct ata_port *ap, struct ata_queued_cmd *qc) { @@ -29,7 +33,7 @@ u8 status, host_stat = 0; VPRINTK("ata%u: protocol %d task_state %d\n", -@@ -4880,6 +4881,11 @@ inline unsigned int ata_host_intr (struc +@@ -4935,6 +4936,11 @@ inline unsigned int ata_host_intr (struc ap->ops->irq_clear(ap); ata_hsm_move(ap, qc, status, 0); @@ -41,7 +45,7 @@ return 1; /* irq handled */ idle_irq: -@@ -5560,9 +5566,8 @@ int ata_device_add(const struct ata_prob +@@ -5615,9 +5621,8 @@ int ata_device_add(const struct ata_prob ap->ioaddr.bmdma_addr, irq_line); @@ -53,10 +57,8 @@ } /* obtain irq, that may be shared between channels */ -diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c -index 5b98f42..93ef023 100644 ---- a/drivers/ata/libata-sff.c -+++ b/drivers/ata/libata-sff.c +--- linux-2.6.18.orig/drivers/ata/libata-sff.c ++++ linux-2.6.18/drivers/ata/libata-sff.c @@ -671,6 +671,14 @@ void ata_bmdma_freeze(struct ata_port *a writeb(ap->ctl, (void __iomem *)ioaddr->ctl_addr); else @@ -72,7 +74,7 @@ } /** -@@ -714,7 +722,6 @@ void ata_bmdma_drive_eh(struct ata_port +@@ -714,7 +722,6 @@ void ata_bmdma_drive_eh(struct ata_port ata_reset_fn_t softreset, ata_reset_fn_t hardreset, ata_postreset_fn_t postreset) { @@ -80,7 +82,7 @@ struct ata_queued_cmd *qc; unsigned long flags; int thaw = 0; -@@ -734,8 +741,6 @@ void ata_bmdma_drive_eh(struct ata_port +@@ -734,8 +741,6 @@ void ata_bmdma_drive_eh(struct ata_port host_stat = ata_bmdma_status(ap); @@ -97,11 +99,9 @@ if (port_mask & ATA_PORT_PRIMARY) { probe_ent->irq = ATA_PRIMARY_IRQ; -diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c -index 3d9fa1c..91e0305 100644 ---- a/drivers/ata/sata_sil.c -+++ b/drivers/ata/sata_sil.c -@@ -357,6 +357,7 @@ static void sil_scr_write (struct ata_po +--- linux-2.6.18.orig/drivers/ata/sata_sil.c ++++ linux-2.6.18/drivers/ata/sata_sil.c +@@ -356,6 +356,7 @@ static void sil_scr_write (struct ata_po static void sil_host_intr(struct ata_port *ap, u32 bmdma2) { @@ -109,7 +109,7 @@ struct ata_queued_cmd *qc = ata_qc_from_tag(ap, ap->active_tag); u8 status; -@@ -429,6 +430,10 @@ static void sil_host_intr(struct ata_por +@@ -428,6 +429,10 @@ static void sil_host_intr(struct ata_por /* kick HSM in the ass */ ata_hsm_move(ap, qc, status, 0); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi-battery-sleep-fix.diff new/patches.fixes/acpi-battery-sleep-fix.diff --- old/patches.fixes/acpi-battery-sleep-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/acpi-battery-sleep-fix.diff 2006-11-28 21:44:29.000000000 +0100 @@ -0,0 +1,60 @@ +From: Jiri Kosina <jikos@jikos.cz> +Date: Tue, 10 Oct 2006 21:20:41 +0000 (-0700) +Subject: ACPI: check battery status on resume for un/plug events during sleep +Patch-mainline: v2.6.19-rc3 +References: 217564 + +ACPI: check battery status on resume for un/plug events during sleep + +Add ->resume method to the ACPI battery handler to check +if the battery state has changed during sleep. +If yes, update the ACPI internal data structures +for benefit of /proc/acpi/battery/. + +Signed-off-by: Jiri Kosina <jikos@jikos.cz> +Cc: Stefan Seyfried <seife@suse.de> +Acked-by: Pavel Machek <pavel@ucw.cz> +Signed-off-by: Andrew Morton <akpm@osdl.org> +Signed-off-by: Len Brown <len.brown@intel.com> +Acked-by: Jeff Mahoney <jeffm@suse.com> +--- + +diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c +index 9810e2a..026e407 100644 +--- a/drivers/acpi/battery.c ++++ b/drivers/acpi/battery.c +@@ -64,6 +64,7 @@ extern void *acpi_unlock_battery_dir(str + + static int acpi_battery_add(struct acpi_device *device); + static int acpi_battery_remove(struct acpi_device *device, int type); ++static int acpi_battery_resume(struct acpi_device *device, int status); + + static struct acpi_driver acpi_battery_driver = { + .name = ACPI_BATTERY_DRIVER_NAME, +@@ -71,6 +72,7 @@ static struct acpi_driver acpi_battery_d + .ids = ACPI_BATTERY_HID, + .ops = { + .add = acpi_battery_add, ++ .resume = acpi_battery_resume, + .remove = acpi_battery_remove, + }, + }; +@@ -753,6 +755,18 @@ static int acpi_battery_remove(struct ac + return 0; + } + ++/* this is needed to learn about changes made in suspended state */ ++static int acpi_battery_resume(struct acpi_device *device, int state) ++{ ++ struct acpi_battery *battery; ++ ++ if (!device) ++ return -EINVAL; ++ ++ battery = device->driver_data; ++ return acpi_battery_check(battery); ++} ++ + static int __init acpi_battery_init(void) + { + int result; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_cpufreq_do_not_load_unconditionally.patch new/patches.fixes/acpi_cpufreq_do_not_load_unconditionally.patch --- old/patches.fixes/acpi_cpufreq_do_not_load_unconditionally.patch 2006-11-14 13:38:53.000000000 +0100 +++ new/patches.fixes/acpi_cpufreq_do_not_load_unconditionally.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -From: Thomas Renninger <trenn@suse.de> -Subject: Do not load acpi_cpufreq unconditionally -Patch-mainline: yes -References: 218377 - -The acpi-cpufreq module currently even loads on machines that -do not support cpufreq and break suspend and possible other things -there. This patch goes back to behaviour to let the module only load -if ACPI subsystem provides cpufreq data. - -Signed-off-by: Thomas Renninger <trenn@suse.de> -Signed-off-by: Dave Jones <davej@redhat.com> - ---- x/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c -+++ y/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c -@@ -597,7 +597,6 @@ static struct cpufreq_driver acpi_cpufre - .name = "acpi-cpufreq", - .owner = THIS_MODULE, - .attr = acpi_cpufreq_attr, -- .flags = CPUFREQ_STICKY, - }; - - -@@ -608,7 +607,7 @@ acpi_cpufreq_init (void) - - acpi_cpufreq_early_init_acpi(); - -- return cpufreq_register_driver(&acpi_cpufreq_driver); -+ return cpufreq_register_driver(&acpi_cpufreq_driver); - } - - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/compat_do_ipt_get_ctl-cap_net_admin.fix new/patches.fixes/compat_do_ipt_get_ctl-cap_net_admin.fix --- old/patches.fixes/compat_do_ipt_get_ctl-cap_net_admin.fix 2006-11-03 18:08:51.000000000 +0100 +++ new/patches.fixes/compat_do_ipt_get_ctl-cap_net_admin.fix 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Björn Steinbrink <B.Steinbrink@gmx.de> -Subject: kernel: missing check in compat IPT handling -Acked-by: Karsten Keil <kkeil@suse.de> -Reference: 213693 -Patch-mainline: 2.6.19 - -The 32bit compatibility layer has no CAP_NET_ADMIN check in -compat_do_ipt_get_ctl, which for example allows to list the current -iptables rules even without having that capability (the non-compat -version requires it). Other capabilities might be required to exploit -the bug (eg. CAP_NET_RAW to get the nfnetlink socket?), so a plain user -can't exploit it, but a setup actually using the posix capability system -might very well hit such a constellation of granted capabilities. - -Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> - -Index: linux-2.6.18/net/ipv4/netfilter/ip_tables.c -=================================================================== ---- linux-2.6.18.orig/net/ipv4/netfilter/ip_tables.c -+++ linux-2.6.18/net/ipv4/netfilter/ip_tables.c -@@ -1925,6 +1925,9 @@ compat_do_ipt_get_ctl(struct sock *sk, i - { - int ret; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - switch (cmd) { - case IPT_SO_GET_INFO: - ret = get_info(user, len, 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/cramfs-blocksize.diff new/patches.fixes/cramfs-blocksize.diff --- old/patches.fixes/cramfs-blocksize.diff 2006-11-09 20:29:18.000000000 +0100 +++ new/patches.fixes/cramfs-blocksize.diff 2006-12-02 12:24:03.000000000 +0100 @@ -23,17 +23,18 @@ Signed-off-by: Phillip Lougher <phillip <at> lougher.org.uk> Acked-by: Jeff Mahoney <jeffm@suse.com> -diff -Nurp a/fs/cramfs/inode.c b/fs/cramfs/inode.c ---- a/fs/cramfs/inode.c 2006-11-05 00:59:53.000000000 +0000 -+++ b/fs/cramfs/inode.c 2006-11-05 03:17:43.000000000 +0000 -@@ -481,6 +481,8 @@ static int cramfs_readpage(struct file * - pgdata = kmap(page); - if (compr_len == 0) - ; /* hole */ +--- + fs/cramfs/inode.c | 2 ++ + 1 files changed, 2 insertions(+) + +--- linux-2.6.18.orig/fs/cramfs/inode.c ++++ linux-2.6.18/fs/cramfs/inode.c +@@ -483,6 +483,8 @@ static int cramfs_readpage(struct file * + pgdata = kmap(page); + if (compr_len == 0) + ; /* hole */ + else if (compr_len > (PAGE_CACHE_SIZE << 1)) + printk(KERN_ERR "cramfs: bad compressed blocksize %u\n", compr_len); - else { - mutex_lock(&read_mutex); - bytes_filled = cramfs_uncompress_block(pgdata, - - + else { + mutex_lock(&read_mutex); + bytes_filled = cramfs_uncompress_block(pgdata, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fix-softirq-race new/patches.fixes/fix-softirq-race --- old/patches.fixes/fix-softirq-race 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/fix-softirq-race 2006-11-30 18:49:05.000000000 +0100 @@ -0,0 +1,36 @@ +From: Zachary Amsden <zach@vmware.com> +Subject: Fix softirq race on bootup that triggers on emulators +Acked-by: ak@suse.de + +It is possible to have tasklets get scheduled before softirqd has had +a chance to spawn on all CPUs. This is totally harmless; after success +during action CPU_UP_PREPARE, action CPU_ONLINE will be called, which +immediately wakes softirqd on the appropriate CPU to process the already +pending tasklets. So there is no danger of having a missed wakeup for +any tasklets that were already pending. + +In particular, i386 is affected by this during startup, and is visible when +using a very large initrd; during the time it takes for the initrd to be +decompressed, a timer IRQ can come in and schedule RCU callbacks. It is also +possible that resending of a hardware IRQ via a softirq triggers the same bug. + +Because of different timing conditions, this shows up in all emulators +and virtual machines tested, including Xen, VMware, Virtual PC, and Qemu. +It is also possible to trigger on native hardware with a large enough initrd, +although I don't have a reliable case demonstrating that. + +Signed-off-by: Zachary Amsden <zach@vmware.com> + +Index: linux-2.6.18/kernel/softirq.c +=================================================================== +--- linux-2.6.18.orig/kernel/softirq.c 2006-11-10 14:44:39.000000000 -0800 ++++ linux-2.6.18/kernel/softirq.c 2006-11-29 22:19:36.000000000 -0800 +@@ -574,8 +574,6 @@ static int __cpuinit cpu_callback(struct + + switch (action) { + case CPU_UP_PREPARE: +- BUG_ON(per_cpu(tasklet_vec, hotcpu).list); +- BUG_ON(per_cpu(tasklet_hi_vec, hotcpu).list); + p = kthread_create(ksoftirqd, hcpu, "ksoftirqd/%d", hotcpu); + if (IS_ERR(p)) { + printk("ksoftirqd for %i failed\n", hotcpu); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/handle-ext3-directory-corruption-better.patch new/patches.fixes/handle-ext3-directory-corruption-better.patch --- old/patches.fixes/handle-ext3-directory-corruption-better.patch 2006-11-17 22:20:07.000000000 +0100 +++ new/patches.fixes/handle-ext3-directory-corruption-better.patch 2006-12-02 12:24:03.000000000 +0100 @@ -47,10 +47,9 @@ fs/ext3/namei.c | 9 +++++++++ 2 files changed, 12 insertions(+) -diff -puN fs/ext3/dir.c~handle-ext3-directory-corruption-better fs/ext3/dir.c ---- a/fs/ext3/dir.c~handle-ext3-directory-corruption-better -+++ a/fs/ext3/dir.c -@@ -154,6 +154,9 @@ static int ext3_readdir(struct file * fi +--- linux-2.6.18.orig/fs/ext3/dir.c ++++ linux-2.6.18/fs/ext3/dir.c +@@ -151,6 +151,9 @@ static int ext3_readdir(struct file * fi ext3_error (sb, "ext3_readdir", "directory #%lu contains a hole at offset %lu", inode->i_ino, (unsigned long)filp->f_pos); @@ -60,9 +59,8 @@ filp->f_pos += sb->s_blocksize - offset; continue; } -diff -puN fs/ext3/namei.c~handle-ext3-directory-corruption-better fs/ext3/namei.c ---- a/fs/ext3/namei.c~handle-ext3-directory-corruption-better -+++ a/fs/ext3/namei.c +--- linux-2.6.18.orig/fs/ext3/namei.c ++++ linux-2.6.18/fs/ext3/namei.c @@ -552,6 +552,15 @@ static int htree_dirblock_to_tree(struct dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(0)); @@ -79,4 +77,3 @@ ext3fs_dirhash(de->name, de->name_len, hinfo); if ((hinfo->hash < start_hash) || ((hinfo->hash == start_hash) && -_ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/hfs-fail-mount.diff new/patches.fixes/hfs-fail-mount.diff --- old/patches.fixes/hfs-fail-mount.diff 2006-11-22 20:51:39.000000000 +0100 +++ new/patches.fixes/hfs-fail-mount.diff 2006-12-02 12:24:03.000000000 +0100 @@ -44,11 +44,13 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> --- -diff --git a/fs/hfs/super.c b/fs/hfs/super.c -index d43b4fc..85b17b3 100644 ---- a/fs/hfs/super.c -+++ b/fs/hfs/super.c -@@ -390,11 +390,13 @@ static int hfs_fill_super(struct super_b +--- + fs/hfs/super.c | 2 ++ + 1 files changed, 2 insertions(+) + +--- linux-2.6.18.orig/fs/hfs/super.c ++++ linux-2.6.18/fs/hfs/super.c +@@ -391,11 +391,13 @@ static int hfs_fill_super(struct super_b hfs_find_exit(&fd); goto bail_no_root; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/netfilter-compat.patch new/patches.fixes/netfilter-compat.patch --- old/patches.fixes/netfilter-compat.patch 2006-10-10 09:45:56.000000000 +0200 +++ new/patches.fixes/netfilter-compat.patch 2006-12-02 12:24:03.000000000 +0100 @@ -41,8 +41,6 @@ net/netfilter/xt_mark.c | 36 ++++++ 8 files changed, 342 insertions(+), 185 deletions(-) -Index: linux-2.6.18/include/linux/netfilter/x_tables.h -=================================================================== --- linux-2.6.18.orig/include/linux/netfilter/x_tables.h +++ linux-2.6.18/include/linux/netfilter/x_tables.h @@ -142,12 +142,6 @@ struct xt_counters_info @@ -114,11 +112,9 @@ #endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ -Index: linux-2.6.18/net/ipv4/netfilter/ip_tables.c -=================================================================== --- linux-2.6.18.orig/net/ipv4/netfilter/ip_tables.c +++ linux-2.6.18/net/ipv4/netfilter/ip_tables.c -@@ -950,73 +950,28 @@ static short compat_calc_jump(u_int16_t +@@ -944,73 +944,28 @@ static short compat_calc_jump(u_int16_t return delta; } @@ -204,7 +200,7 @@ return 0; } -@@ -1031,10 +986,7 @@ static int compat_calc_entry(struct ipt_ +@@ -1025,10 +980,7 @@ static int compat_calc_entry(struct ipt_ entry_offset = (void *)e - base; IPT_MATCH_ITERATE(e, compat_calc_match, &off); t = ipt_get_target(e); @@ -216,7 +212,7 @@ newinfo->size -= off; ret = compat_add_offset(entry_offset, off); if (ret) -@@ -1420,17 +1372,13 @@ struct compat_ipt_replace { +@@ -1414,17 +1366,13 @@ struct compat_ipt_replace { }; static inline int compat_copy_match_to_user(struct ipt_entry_match *m, @@ -237,7 +233,7 @@ { struct ipt_entry_target __user *t; struct compat_ipt_entry __user *ce; -@@ -1450,11 +1398,7 @@ static int compat_copy_entry_to_user(str +@@ -1444,11 +1392,7 @@ static int compat_copy_entry_to_user(str if (ret) goto out; t = ipt_get_target(e); @@ -250,7 +246,7 @@ if (ret) goto out; ret = -EFAULT; -@@ -1486,11 +1430,7 @@ compat_check_calc_match(struct ipt_entry +@@ -1480,11 +1424,7 @@ compat_check_calc_match(struct ipt_entry return match ? PTR_ERR(match) : -ENOENT; } m->u.kernel.match = match; @@ -263,7 +259,7 @@ (*i)++; return 0; -@@ -1551,10 +1491,7 @@ check_compat_entry_size_and_hooks(struct +@@ -1552,10 +1492,7 @@ check_compat_entry_size_and_hooks(struct } t->u.kernel.target = target; @@ -275,7 +271,7 @@ *size += off; ret = compat_add_offset(entry_offset, off); if (ret) -@@ -1589,10 +1526,7 @@ static inline int compat_copy_match_from +@@ -1593,10 +1530,7 @@ static inline int compat_copy_match_from dm = (struct ipt_entry_match *)*dstptr; match = m->u.kernel.match; @@ -287,7 +283,7 @@ ret = xt_check_match(match, AF_INET, dm->u.match_size - sizeof(*dm), name, hookmask, ip->proto, -@@ -1634,10 +1568,7 @@ static int compat_copy_entry_from_user(s +@@ -1636,10 +1570,7 @@ static int compat_copy_entry_from_user(s de->target_offset = e->target_offset - (origsize - *size); t = ipt_get_target(e); target = t->u.kernel.target; @@ -299,7 +295,7 @@ de->next_offset = e->next_offset - (origsize - *size); for (h = 0; h < NF_IP_NUMHOOKS; h++) { -@@ -2200,7 +2131,9 @@ static struct ipt_target ipt_standard_ta +@@ -2203,7 +2134,9 @@ static struct ipt_target ipt_standard_ta .targetsize = sizeof(int), .family = AF_INET, #ifdef CONFIG_COMPAT @@ -310,8 +306,6 @@ #endif }; -Index: linux-2.6.18/net/netfilter/x_tables.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/x_tables.c +++ linux-2.6.18/net/netfilter/x_tables.c @@ -273,52 +273,65 @@ int xt_check_match(const struct xt_match @@ -528,8 +522,6 @@ #endif struct xt_table_info *xt_alloc_table_info(unsigned int size) -Index: linux-2.6.18/net/netfilter/xt_CONNMARK.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/xt_CONNMARK.c +++ linux-2.6.18/net/netfilter/xt_CONNMARK.c @@ -97,12 +97,48 @@ checkentry(const char *tablename, @@ -581,8 +573,6 @@ .me = THIS_MODULE }; -Index: linux-2.6.18/net/netfilter/xt_MARK.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/xt_MARK.c +++ linux-2.6.18/net/netfilter/xt_MARK.c @@ -112,12 +112,46 @@ checkentry_v1(const char *tablename, @@ -632,8 +622,6 @@ .me = THIS_MODULE, .family = AF_INET, .revision = 0, -Index: linux-2.6.18/net/netfilter/xt_connmark.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/xt_connmark.c +++ linux-2.6.18/net/netfilter/xt_connmark.c @@ -82,12 +82,48 @@ destroy(const struct xt_match *match, vo @@ -685,8 +673,6 @@ .family = AF_INET, .me = THIS_MODULE }; -Index: linux-2.6.18/net/netfilter/xt_limit.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/xt_limit.c +++ linux-2.6.18/net/netfilter/xt_limit.c @@ -136,12 +136,61 @@ ipt_limit_checkentry(const char *tablena @@ -751,8 +737,6 @@ .me = THIS_MODULE, }; static struct xt_match limit6_reg = { -Index: linux-2.6.18/net/netfilter/xt_mark.c -=================================================================== --- linux-2.6.18.orig/net/netfilter/xt_mark.c +++ linux-2.6.18/net/netfilter/xt_mark.c @@ -51,11 +51,47 @@ checkentry(const char *tablename, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/rtc-no-irq.patch new/patches.fixes/rtc-no-irq.patch --- old/patches.fixes/rtc-no-irq.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/rtc-no-irq.patch 2006-12-11 14:52:53.000000000 +0100 @@ -0,0 +1,61 @@ +From: jbeulich@novell.com +Subject: RTC driver init adjustment +Patch-mainline: unknown +References: 226676 + +Ensure RTC driver doesn't use its timer when it doesn't get to set it up. + +Index: head-2006-12-01/drivers/char/rtc.c +=================================================================== +--- head-2006-12-01.orig/drivers/char/rtc.c 2006-12-01 10:46:33.000000000 +0100 ++++ head-2006-12-01/drivers/char/rtc.c 2006-12-08 11:03:51.000000000 +0100 +@@ -958,6 +958,7 @@ static int __init rtc_init(void) + } + } + #endif ++ rtc_has_irq = 0; + printk(KERN_ERR "rtc_init: no PC rtc found\n"); + return -EIO; + +@@ -972,6 +973,7 @@ found: + * PCI Slot 2 INTA# (and some INTx# in Slot 1). + */ + if (request_irq(rtc_irq, rtc_interrupt, IRQF_SHARED, "rtc", (void *)&rtc_port)) { ++ rtc_has_irq = 0; + printk(KERN_ERR "rtc: cannot register IRQ %d\n", rtc_irq); + return -EIO; + } +@@ -982,6 +984,9 @@ no_irq: + else + r = request_mem_region(RTC_PORT(0), RTC_IO_EXTENT, "rtc"); + if (!r) { ++#ifdef RTC_IRQ ++ rtc_has_irq = 0; ++#endif + printk(KERN_ERR "rtc: I/O resource %lx is not free.\n", + (long)(RTC_PORT(0))); + return -EIO; +@@ -996,6 +1001,7 @@ no_irq: + + if(request_irq(RTC_IRQ, rtc_int_handler_ptr, IRQF_DISABLED, "rtc", NULL)) { + /* Yeah right, seeing as irq 8 doesn't even hit the bus. */ ++ rtc_has_irq = 0; + printk(KERN_ERR "rtc: IRQ %d is not free.\n", RTC_IRQ); + if (RTC_IOMAPPED) + release_region(RTC_PORT(0), RTC_IO_EXTENT); +@@ -1012,6 +1018,7 @@ no_irq: + if (misc_register(&rtc_dev)) { + #ifdef RTC_IRQ + free_irq(RTC_IRQ, NULL); ++ rtc_has_irq = 0; + #endif + release_region(RTC_PORT(0), RTC_IO_EXTENT); + return -ENODEV; +@@ -1021,6 +1028,7 @@ no_irq: + if (!ent) { + #ifdef RTC_IRQ + free_irq(RTC_IRQ, NULL); ++ rtc_has_irq = 0; + #endif + release_region(RTC_PORT(0), RTC_IO_EXTENT); + misc_deregister(&rtc_dev); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/unwind-miscompilation new/patches.fixes/unwind-miscompilation --- old/patches.fixes/unwind-miscompilation 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/unwind-miscompilation 2006-12-02 07:07:04.000000000 +0100 @@ -0,0 +1,43 @@ +Subject: work around gcc4 issue with -Os in Dwarf2 stack unwind +From: "Jan Beulich" <jbeulich@novell.com> +Acked-by: ak@suse.de + +This fixes a problem with gcc4 mis-compiling the stack unwind code under +-Os, which resulted in 'stuck' messages whenever an assembly routine was +encountered. + +(The second hunk is trivial cleanup.) + +Signed-off-by: Jan Beulich <jbeulich@novell.com> +Signed-off-by: Andi Kleen <ak@suse.de> + +--- + kernel/unwind.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +--- linux-2.6.18.orig/kernel/unwind.c ++++ linux-2.6.18/kernel/unwind.c +@@ -683,8 +683,11 @@ int unwind(struct unwind_frame_info *fra + else { + retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end); + /* skip augmentation */ +- if (((const char *)(cie + 2))[1] == 'z') +- ptr += get_uleb128(&ptr, end); ++ if (((const char *)(cie + 2))[1] == 'z') { ++ uleb128_t augSize = get_uleb128(&ptr, end); ++ ++ ptr += augSize; ++ } + if (ptr > end + || retAddrReg >= ARRAY_SIZE(reg_info) + || REG_INVALID(retAddrReg) +@@ -708,9 +711,7 @@ int unwind(struct unwind_frame_info *fra + if (cie == NULL || fde == NULL) { + #ifdef CONFIG_FRAME_POINTER + unsigned long top, bottom; +-#endif + +-#ifdef CONFIG_FRAME_POINTER + top = STACK_TOP(frame->task); + bottom = STACK_BOTTOM(frame->task); + # if FRAME_RETADDR_OFFSET < 0 ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 2004 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-common new/patches.suse/kdb-common --- old/patches.suse/kdb-common 2006-10-18 16:08:10.000000000 +0200 +++ new/patches.suse/kdb-common 2006-12-02 12:24:03.000000000 +0100 @@ -3604,7 +3604,7 @@ static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick", "Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"}; /* -@@ -2021,6 +2025,12 @@ static void hid_disconnect(struct usb_in +@@ -2034,6 +2038,12 @@ static void hid_disconnect(struct usb_in if (!hid) return; @@ -3617,7 +3617,7 @@ spin_lock_irq(&hid->inlock); /* Sync with error handler */ usb_set_intfdata(intf, NULL); spin_unlock_irq(&hid->inlock); -@@ -2098,6 +2108,15 @@ static int hid_probe(struct usb_interfac +@@ -2111,6 +2121,15 @@ static int hid_probe(struct usb_interfac printk(": USB HID v%x.%02x %s [%s] on %s\n", hid->version >> 8, hid->version & 0xff, c, hid->name, path); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-alignment-exception.patch new/patches.suse/ppc-alignment-exception.patch --- old/patches.suse/ppc-alignment-exception.patch 2006-11-13 19:06:50.000000000 +0100 +++ new/patches.suse/ppc-alignment-exception.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,57 +0,0 @@ -Subject: Make alignment exception always check exception table -From: Benjamin Herrenschmidt <benh@kernel.crashing.org> -References: 217295 -Patch-mainline: yes - - The alignment exception used to only check the exception table for - -EFAULT, not for other errors. That opens an oops window if we can - coerce the kernel into getting an alignment exception for other reasons - in what would normally be a user-protected accessor, which can be done - via some of the futex ops. This fixes it by always checking the - exception tables. - -Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> -Signed-off-by: Paul Mackerras <paulus@samba.org> -Signed-off-by: Olaf Hering <olh@suse.de> - ---- - arch/powerpc/kernel/traps.c | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) - -Index: linux-2.6.18/arch/powerpc/kernel/traps.c -=================================================================== ---- linux-2.6.18.orig/arch/powerpc/kernel/traps.c -+++ linux-2.6.18/arch/powerpc/kernel/traps.c -@@ -818,7 +818,7 @@ void __kprobes program_check_exception(s - - void alignment_exception(struct pt_regs *regs) - { -- int fixed = 0; -+ int sig, code, fixed = 0; - - /* we don't implement logging of alignment exceptions */ - if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) -@@ -832,14 +832,16 @@ void alignment_exception(struct pt_regs - - /* Operand address was bad */ - if (fixed == -EFAULT) { -- if (user_mode(regs)) -- _exception(SIGSEGV, regs, SEGV_ACCERR, regs->dar); -- else -- /* Search exception table */ -- bad_page_fault(regs, regs->dar, SIGSEGV); -- return; -+ sig = SIGSEGV; -+ code = SEGV_ACCERR; -+ } else { -+ sig = SIGBUS; -+ code = BUS_ADRALN; - } -- _exception(SIGBUS, regs, BUS_ADRALN, regs->dar); -+ if (user_mode(regs)) -+ _exception(sig, regs, code, regs->dar); -+ else -+ bad_page_fault(regs, regs->dar, sig); - } - - void StackOverflow(struct pt_regs *regs) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-iso-usbkbd.patch new/patches.suse/ppc-powerbook-iso-usbkbd.patch --- old/patches.suse/ppc-powerbook-iso-usbkbd.patch 2006-11-06 11:03:00.000000000 +0100 +++ new/patches.suse/ppc-powerbook-iso-usbkbd.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ -From: olh@suse.de -Subject: correct keymapping on Powerbook built-in USB ISO keyboards - -similar to the version in adbhid_input_register() -The '<>' key and the '^°' key on a german keyboard is swapped. -Provide correct keys to userland, external USB keyboards will not work -correctly when the 'badmap'/'goodmap' workarounds from xkeyboard-config -are used. -It is expected that distributions drop the badmap/goodmap part from -keycodes/macintosh in the xkeyboard-config package. - -Signed-off-by: Olaf Hering <olh@suse.de> - ---- - drivers/usb/input/hid-core.c | 4 ++-- - drivers/usb/input/hid-input.c | 17 +++++++++++++++++ - drivers/usb/input/hid.h | 1 + - 3 files changed, 20 insertions(+), 2 deletions(-) - -Index: linux-2.6.18/drivers/usb/input/hid-core.c -=================================================================== ---- linux-2.6.18.orig/drivers/usb/input/hid-core.c -+++ linux-2.6.18/drivers/usb/input/hid-core.c -@@ -1739,10 +1739,10 @@ static const struct hid_blacklist { - { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_CYMOTION }, - - { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -- { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_POWERBOOK_ISO_KEYBOARD }, - { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, - { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -- { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_POWERBOOK_ISO_KEYBOARD }, - { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, - { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, - { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -Index: linux-2.6.18/drivers/usb/input/hid-input.c -=================================================================== ---- linux-2.6.18.orig/drivers/usb/input/hid-input.c -+++ linux-2.6.18/drivers/usb/input/hid-input.c -@@ -123,6 +123,12 @@ static struct hidinput_key_translation p - { } - }; - -+static struct hidinput_key_translation powerbook_iso_keyboard[] = { -+ { KEY_GRAVE, KEY_102ND }, -+ { KEY_102ND, KEY_GRAVE }, -+ { } -+}; -+ - static int usbhid_pb_fnmode = 1; - module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644); - MODULE_PARM_DESC(pb_fnmode, -@@ -197,6 +203,14 @@ static int hidinput_pb_event(struct hid_ - } - } - -+ if (hid->quirks & HID_QUIRK_POWERBOOK_ISO_KEYBOARD) { -+ trans = find_translation(powerbook_iso_keyboard, usage->code); -+ if (trans) { -+ input_event(input, usage->type, trans->to, value); -+ return 1; -+ } -+ } -+ - return 0; - } - -@@ -212,6 +226,9 @@ static void hidinput_pb_setup(struct inp - - for (trans = powerbook_numlock_keys; trans->from; trans++) - set_bit(trans->to, input->keybit); -+ -+ for (trans = powerbook_iso_keyboard; trans->from; trans++) -+ set_bit(trans->to, input->keybit); - } - #else - static inline int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, -Index: linux-2.6.18/drivers/usb/input/hid.h -=================================================================== ---- linux-2.6.18.orig/drivers/usb/input/hid.h -+++ linux-2.6.18/drivers/usb/input/hid.h -@@ -261,6 +261,7 @@ struct hid_item { - #define HID_QUIRK_POWERBOOK_FN_ON 0x00002000 - #define HID_QUIRK_INVERT_HWHEEL 0x00004000 - #define HID_QUIRK_IGNORE_MOUSE 0x00008000 -+#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00010000 - - /* - * This is the global environment of the parser. This information is diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-touchpad-quirk.patch new/patches.suse/ppc-powerbook-touchpad-quirk.patch --- old/patches.suse/ppc-powerbook-touchpad-quirk.patch 2006-11-05 09:01:28.000000000 +0100 +++ new/patches.suse/ppc-powerbook-touchpad-quirk.patch 2006-12-02 12:24:03.000000000 +0100 @@ -17,20 +17,16 @@ drivers/usb/input/hid.h | 1 + 2 files changed, 24 insertions(+), 10 deletions(-) -Index: linux-2.6.18/drivers/usb/input/hid.h -=================================================================== --- linux-2.6.18.orig/drivers/usb/input/hid.h +++ linux-2.6.18/drivers/usb/input/hid.h @@ -260,6 +260,7 @@ struct hid_item { #define HID_QUIRK_POWERBOOK_HAS_FN 0x00001000 #define HID_QUIRK_POWERBOOK_FN_ON 0x00002000 #define HID_QUIRK_INVERT_HWHEEL 0x00004000 -+#define HID_QUIRK_IGNORE_MOUSE 0x00008000 ++#define HID_QUIRK_IGNORE_MOUSE 0x00008000 + #define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00010000 /* - * This is the global environment of the parser. This information is -Index: linux-2.6.18/drivers/usb/input/hid-core.c -=================================================================== --- linux-2.6.18.orig/drivers/usb/input/hid-core.c +++ linux-2.6.18/drivers/usb/input/hid-core.c @@ -1585,6 +1585,13 @@ void hid_init_reports(struct hid_device @@ -54,23 +50,23 @@ - { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN }, - { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN }, - { USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN }, -- { USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN }, +- { USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD}, - { USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN }, - { USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN }, -- { USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN }, +- { USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD}, - { USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN }, - { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN }, - { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN }, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, -+ { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE}, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_POWERBOOK_ISO_KEYBOARD }, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_POWERBOOK_ISO_KEYBOARD }, ++ { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, ++ { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_IGNORE_MOUSE }, + + { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IR, HID_QUIRK_IGNORE }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-usb-fn-key-default.patch new/patches.suse/ppc-powerbook-usb-fn-key-default.patch --- old/patches.suse/ppc-powerbook-usb-fn-key-default.patch 2006-11-13 09:10:37.000000000 +0100 +++ new/patches.suse/ppc-powerbook-usb-fn-key-default.patch 2006-12-02 12:24:03.000000000 +0100 @@ -18,8 +18,6 @@ drivers/usb/input/hid-input.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.18/drivers/usb/input/hid-input.c -=================================================================== --- linux-2.6.18.orig/drivers/usb/input/hid-input.c +++ linux-2.6.18/drivers/usb/input/hid-input.c @@ -129,7 +129,7 @@ static struct hidinput_key_translation p diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/snd-aoa-device-symlinks.patch new/patches.suse/snd-aoa-device-symlinks.patch --- old/patches.suse/snd-aoa-device-symlinks.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/snd-aoa-device-symlinks.patch 2006-12-01 23:37:48.000000000 +0100 @@ -0,0 +1,109 @@ +Subject: create sysfs device symlinks for snd-aoa +From: olh@suse.de +References: 106294 + +make hal happy, provide device symlinks for sound devices +make security happy, no need to put the default user in group audio +make hwinfo happy, provide module symlink in case it cares about this + + +--- + sound/aoa/aoa.h | 2 +- + sound/aoa/core/snd-aoa-alsa.c | 3 ++- + sound/aoa/core/snd-aoa-alsa.h | 2 +- + sound/aoa/core/snd-aoa-core.c | 4 ++-- + sound/aoa/fabrics/snd-aoa-fabric-layout.c | 5 ++++- + 5 files changed, 10 insertions(+), 6 deletions(-) + +Index: linux-2.6/sound/aoa/aoa.h +=================================================================== +--- linux-2.6.orig/sound/aoa/aoa.h ++++ linux-2.6/sound/aoa/aoa.h +@@ -99,7 +99,7 @@ struct aoa_fabric { + * that are not assigned yet are passed to the fabric + * again for reconsideration. */ + extern int +-aoa_fabric_register(struct aoa_fabric *fabric); ++aoa_fabric_register(struct aoa_fabric *fabric, struct device *dev); + + /* it is vital to call this when the fabric exits! + * When calling, the remove_codec will be called +Index: linux-2.6/sound/aoa/fabrics/snd-aoa-fabric-layout.c +=================================================================== +--- linux-2.6.orig/sound/aoa/fabrics/snd-aoa-fabric-layout.c ++++ linux-2.6/sound/aoa/fabrics/snd-aoa-fabric-layout.c +@@ -1014,7 +1014,7 @@ static int aoa_fabric_layout_probe(struc + + ldev->gpio.methods->init(&ldev->gpio); + +- err = aoa_fabric_register(&layout_fabric); ++ err = aoa_fabric_register(&layout_fabric, &sdev->ofdev.dev); + if (err && err != -EALREADY) { + printk(KERN_INFO "snd-aoa-fabric-layout: can't use," + " another fabric is active!\n"); +@@ -1107,6 +1107,9 @@ static struct soundbus_driver aoa_soundb + .suspend = aoa_fabric_layout_suspend, + .resume = aoa_fabric_layout_resume, + #endif ++ .driver = { ++ .owner = THIS_MODULE, ++ } + }; + + static int __init aoa_fabric_layout_init(void) +Index: linux-2.6/sound/aoa/core/snd-aoa-alsa.c +=================================================================== +--- linux-2.6.orig/sound/aoa/core/snd-aoa-alsa.c ++++ linux-2.6/sound/aoa/core/snd-aoa-alsa.c +@@ -14,7 +14,7 @@ MODULE_PARM_DESC(index, "index for AOA s + + static struct aoa_card *aoa_card; + +-int aoa_alsa_init(char *name, struct module *mod) ++int aoa_alsa_init(char *name, struct module *mod, struct device *dev) + { + struct snd_card *alsa_card; + int err; +@@ -28,6 +28,7 @@ int aoa_alsa_init(char *name, struct mod + return -ENOMEM; + aoa_card = alsa_card->private_data; + aoa_card->alsa_card = alsa_card; ++ alsa_card->dev = dev; + strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver)); + strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname)); + strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname)); +Index: linux-2.6/sound/aoa/core/snd-aoa-alsa.h +=================================================================== +--- linux-2.6.orig/sound/aoa/core/snd-aoa-alsa.h ++++ linux-2.6/sound/aoa/core/snd-aoa-alsa.h +@@ -10,7 +10,7 @@ + #define __SND_AOA_ALSA_H + #include "../aoa.h" + +-extern int aoa_alsa_init(char *name, struct module *mod); ++extern int aoa_alsa_init(char *name, struct module *mod, struct device *dev); + extern void aoa_alsa_cleanup(void); + + #endif /* __SND_AOA_ALSA_H */ +Index: linux-2.6/sound/aoa/core/snd-aoa-core.c +=================================================================== +--- linux-2.6.orig/sound/aoa/core/snd-aoa-core.c ++++ linux-2.6/sound/aoa/core/snd-aoa-core.c +@@ -82,7 +82,7 @@ void aoa_codec_unregister(struct aoa_cod + } + EXPORT_SYMBOL_GPL(aoa_codec_unregister); + +-int aoa_fabric_register(struct aoa_fabric *new_fabric) ++int aoa_fabric_register(struct aoa_fabric *new_fabric, struct device *dev) + { + struct aoa_codec *c; + int err; +@@ -98,7 +98,7 @@ int aoa_fabric_register(struct aoa_fabri + if (!new_fabric) + return -EINVAL; + +- err = aoa_alsa_init(new_fabric->name, new_fabric->owner); ++ err = aoa_alsa_init(new_fabric->name, new_fabric->owner, dev); + if (err) + return err; + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/uml-offsetof.patch new/patches.suse/uml-offsetof.patch --- old/patches.suse/uml-offsetof.patch 2006-11-19 18:37:26.000000000 +0100 +++ new/patches.suse/uml-offsetof.patch 2006-12-02 12:24:03.000000000 +0100 @@ -2,14 +2,12 @@ From: olh@suse.de --- - arch/um/sys-i386/user-offsets.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + arch/um/sys-i386/user-offsets.c | 2 +- + 1 files changed, 1 insertion(+), 1 deletion(-) -Index: linux-2.6.19-rc6/arch/um/sys-i386/user-offsets.c -=================================================================== ---- linux-2.6.19-rc6.orig/arch/um/sys-i386/user-offsets.c -+++ linux-2.6.19-rc6/arch/um/sys-i386/user-offsets.c -@@ -2,6 +2,6 @@ +--- linux-2.6.18.orig/arch/um/sys-i386/user-offsets.c ++++ linux-2.6.18/arch/um/sys-i386/user-offsets.c +@@ -2,7 +2,7 @@ #include <signal.h> #include <asm/ptrace.h> #include <asm/user.h> ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen-x86_64-agp new/patches.xen/xen-x86_64-agp --- old/patches.xen/xen-x86_64-agp 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.xen/xen-x86_64-agp 2006-12-04 10:01:43.000000000 +0100 @@ -0,0 +1,45 @@ +From: jbeulich@novell.com +Subject: add missing header +Patch-mainline: obsolete +References: 222174, 224170 + +Index: head-2006-11-21/include/asm-x86_64/mach-xen/asm/agp.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ head-2006-11-21/include/asm-x86_64/mach-xen/asm/agp.h 2006-11-30 15:23:48.000000000 +0100 +@@ -0,0 +1,35 @@ ++#ifndef AGP_H ++#define AGP_H 1 ++ ++#include <asm/cacheflush.h> ++#include <asm/system.h> ++ ++/* ++ * Functions to keep the agpgart mappings coherent. ++ * The GART gives the CPU a physical alias of memory. The alias is ++ * mapped uncacheable. Make sure there are no conflicting mappings ++ * with different cachability attributes for the same page. ++ */ ++ ++int map_page_into_agp(struct page *page); ++int unmap_page_from_agp(struct page *page); ++#define flush_agp_mappings() global_flush_tlb() ++ ++/* Could use CLFLUSH here if the cpu supports it. But then it would ++ need to be called for each cacheline of the whole page so it may not be ++ worth it. Would need a page for it. */ ++#define flush_agp_cache() wbinvd() ++ ++/* Convert a physical address to an address suitable for the GART. */ ++#define phys_to_gart(x) phys_to_machine(x) ++#define gart_to_phys(x) machine_to_phys(x) ++ ++/* GATT allocation. Returns/accepts GATT kernel virtual address. */ ++#define alloc_gatt_pages(order) ({ \ ++ char *_t; dma_addr_t _d; \ ++ _t = dma_alloc_coherent(NULL,PAGE_SIZE<<(order),&_d,GFP_KERNEL); \ ++ _t; }) ++#define free_gatt_pages(table, order) \ ++ dma_free_coherent(NULL,PAGE_SIZE<<(order),(table),virt_to_bus(table)) ++ ++#endif ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-11-27 12:46:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2006-12-19 11:54:42.000000000 +0100 @@ -22,6 +22,9 @@ # Send separate patches upstream if you find a problem... patches.kernel.org/patch-2.6.18.1 patches.kernel.org/patch-2.6.18.1-2 + patches.kernel.org/patch-2.6.18.2-3 + patches.kernel.org/patch-2.6.18.3-4 + patches.kernel.org/patch-2.6.18.4-5 ######################################################## # @@ -56,7 +59,6 @@ # i386 patches.arch/i386-apic-auto - patches.arch/i386-microcode.diff # amd64 | x86-64 | x86_64 # 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T' @@ -66,14 +68,11 @@ # for i386/x86-64 # suse s390 - patches.arch/s390-uaccess-fix # numa mempolicy # suse ppc - patches.suse/ppc-alignment-exception.patch patches.suse/ppc-powerbook-touchpad-quirk.patch - patches.suse/ppc-powerbook-iso-usbkbd.patch patches.suse/ppc-powerbook-usb-fn-key-default.patch patches.arch/ppc-via-pmu-acpower.patch patches.arch/ppc-atyfb-wallstreet-default.patch @@ -84,6 +83,8 @@ patches.suse/suse-ppc32-mol-kbuild.patch # suse ppc64 + patches.arch/ppc-iseries-rd_size.patch + patches.suse/snd-aoa-device-symlinks.patch patches.arch/ppc-os-term-panic_timeout.patch patches.drivers/ppc64-adb patches.suse/suse-ppc64-branding @@ -131,7 +132,6 @@ patches.fixes/apic_fix_suspend.patch - patches.fixes/acpi_cpufreq_do_not_load_unconditionally.patch patches.fixes/cpufreq_PPC_zero.patch # Fix ISA DMA resource setup in ACPIPnP (#116655) @@ -472,7 +472,6 @@ patches.fixes/loop-barriers patches.fixes/loop-barriers2 patches.fixes/grow_buffers-infinite-loop-fix.diff - patches.fixes/compat_do_ipt_get_ctl-cap_net_admin.fix patches.fixes/dm-refcnt-fix.diff @@ -488,8 +487,8 @@ patches.drivers/965-drm patches.drivers/965-agp patches.drivers/965-agp-suspend - patches.drivers/agp-dma32 patches.arch/acpi-use-timer-override + patches.fixes/acpi-battery-sleep-fix.diff # libata fixes patches.drivers/0004-libata-fix-READ_CAPACITY-simulation.txt @@ -502,6 +501,7 @@ patches.drivers/0030-ahci-update-ahci-vt8251-reset-sequence.txt patches.drivers/0031-ahci-do-not-powerdown-during-initialization.txt patches.drivers/0032-ahci-ignore-PORT_IRQ_IF_ERR-on-JMB-controllers.txt + patches.drivers/0033-ata_piix-allow-01b-MAP-for-both-ICH6M-and-ICH7M.txt patches.drivers/0041-libata-fix-scsi_host_template-in-drivers.txt patches.drivers/0042-ahci-AHCI-mode-SATA-patch-for-Intel-ICH9.txt patches.drivers/0043-ata_piix-IDE-mode-SATA-patch-for-Intel-ICH9.txt @@ -510,6 +510,9 @@ patches.drivers/0046-libata-Add-support-for-AHCI-controllers-of-MCP67.txt patches.drivers/0047-libata-Add-support-for-PATA-controllers-of-MCP67-to-pata_amd.txt + patches.fixes/unwind-miscompilation + patches.fixes/fix-softirq-race + patches.fixes/rtc-no-irq.patch # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end @@ -590,6 +593,7 @@ patches.xen/xen-i386-pae-gnttab patches.xen/xen-blktap-unmap-flags patches.xen/xen-x86-clear_fixmap + patches.xen/xen-x86_64-agp # enhancements patches.xen/xen-x86-panic-no-reboot ++++++ supported.conf ++++++ --- kernel-source/supported.conf 2006-11-27 12:46:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/supported.conf 2006-12-19 11:54:52.000000000 +0100 @@ -1114,7 +1114,7 @@ kernel/drivers/serial/icom kernel/drivers/serial/ioc3_serial kernel/drivers/serial/ioc4_serial -- kernel/drivers/serial/jsm/jsm + kernel/drivers/serial/jsm/jsm kernel/drivers/serial/serial_core kernel/drivers/serial/serial_cs kernel/drivers/sn/ioc3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org