Hello community, here is the log from the commit of package kernel-source checked in at Thu May 31 21:26:43 CEST 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-05-25 18:14:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-05-27 18:40:11.000000000 +0200 @@ -1,0 +2,117 @@ +Sun May 27 18:26:47 CEST 2007 - bwalle@suse.de + +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. + +------------------------------------------------------------------- +Sat May 26 13:57:18 CEST 2007 - bwalle@suse.de + +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y + +------------------------------------------------------------------- +Sat May 26 11:39:20 CEST 2007 - schwab@suse.de + +- Remove obsolete patch ppc-ps3-gelic_2621.patch. + +------------------------------------------------------------------- +Sat May 26 10:55:23 CEST 2007 - schwab@suse.de + +- s2io-longlong: Avoid switch on long long. + +------------------------------------------------------------------- +Sat May 26 10:41:21 CEST 2007 - schwab@suse.de + +- Reenable macintosh drivers. + +------------------------------------------------------------------- +Sat May 26 06:44:43 CEST 2007 - gregkh@suse.de + +- patch tree refresh for fuzz cleanups due to new kernel version. + +------------------------------------------------------------------- +Sat May 26 06:38:55 CEST 2007 - gregkh@suse.de + +- Fix up the vanilla config files + +------------------------------------------------------------------- +Sat May 26 01:02:43 CEST 2007 - schwab@suse.de + +- Update kdb patches. + +------------------------------------------------------------------- +Sat May 26 00:45:55 CEST 2007 - schwab@suse.de + +- Update mol patches. + +------------------------------------------------------------------- +Sat May 26 00:41:14 CEST 2007 - schwab@suse.de + +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. + +------------------------------------------------------------------- +Sat May 26 00:00:43 CEST 2007 - jeffm@suse.de + +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. + +------------------------------------------------------------------- +Fri May 25 22:54:45 CEST 2007 - jeffm@suse.de + +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.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.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.21) +# spec file for package kernel-bigsmp (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: Kernel with PAE Support -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Provides: k_smp4G @@ -156,12 +156,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-bigsmp-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -255,7 +255,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -511,6 +511,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.21) +# spec file for package kernel-debug (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: A Debug Version of the Kernel -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -161,12 +161,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-debug-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-debug-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -260,7 +260,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -516,6 +516,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.21) +# spec file for package kernel-default (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch alpha @@ -182,12 +182,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-default-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-default-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -281,7 +281,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -537,6 +537,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.21) +# spec file for package kernel-dummy (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ Name: kernel-dummy URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen@suse.de> -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %install @@ -41,6 +41,87 @@ /etc/dummy %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.21) +# spec file for package kernel-kdump (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: kernel for kdump -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -166,12 +166,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-kdump-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-kdump-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -265,7 +265,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -521,6 +521,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.21) +# spec file for package kernel-ppc64 (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -37,8 +37,8 @@ %define build_vanilla 1 %endif Summary: Kernel for ppc64 Systems -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel Autoreqprov: on @@ -82,7 +82,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch ppc @@ -172,12 +172,12 @@ Tom Gall <tom_gall@vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-ppc64-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -271,7 +271,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -527,6 +527,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.21) +# spec file for package kernel-s390 (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel -Version: 2.6.21 -Release: 5 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Provides: kernel-32bit k_deflt @@ -154,12 +154,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-s390-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-s390-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -253,7 +253,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -509,6 +509,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.21) +# spec file for package kernel-source (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,8 +21,8 @@ %define source_rel %release %endif Summary: The Linux Kernel Sources -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -105,7 +105,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then @@ -128,16 +128,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.21/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.21/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.21/$patch; then + > %_builddir/kernel-source-2.6.22_rc2_git7/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.22_rc2_git7/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22_rc2_git7/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.21 %source_rel -KERNELRELEASE=2.6.21-%source_rel +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22_rc2_git7 %source_rel +KERNELRELEASE=2.6.22-rc2-git7-%source_rel cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS="%symbols" @@ -158,8 +158,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.21/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.21/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.22_rc2_git7/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.22_rc2_git7/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -292,6 +292,87 @@ %files -f kernel-source.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.21) +# spec file for package kernel-syms (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,8 +13,8 @@ Name: kernel-syms URL: http://www.kernel.org/ Summary: Kernel Symbol Versions (modversions) -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: Development/Sources Autoreqprov: off @@ -57,7 +57,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.21-%release +Requires: kernel-source = 2.6.22_rc2_git7-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -90,7 +90,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep echo "Architecture symbol(s):" %symbols @@ -136,6 +136,87 @@ /lib/modules/*/* %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.21) +# spec file for package kernel-um (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The User Mode Linux kernel. -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -162,12 +162,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-um-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-um-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -261,7 +261,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -517,6 +517,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:55.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.21) +# spec file for package kernel-vanilla (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch alpha @@ -174,12 +174,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-vanilla-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -273,7 +273,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -529,6 +529,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xenpae (Version 2.6.21) +# spec file for package kernel-xenpae (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Xen Kernel with PAE support -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 @@ -157,12 +157,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xenpae-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-xenpae-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -256,7 +256,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -512,6 +512,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.Km8312/_old 2007-05-31 21:23:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Km8312/_new 2007-05-31 21:23:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.21) +# spec file for package kernel-xen (Version 2.6.22_rc2_git7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -38,8 +38,8 @@ %define build_vanilla 1 %endif Summary: The Xen Kernel -Version: 2.6.21 -Release: 11 +Version: 2.6.22_rc2_git7 +Release: 1 License: GNU General Public License (GPL) Group: System/Kernel Autoreqprov: on @@ -83,7 +83,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.21-%source_rel +Provides: kernel = 2.6.22_rc2_git7-%source_rel %endif %endif %ifarch %ix86 @@ -160,12 +160,12 @@ -Source Timestamp: 2007/05/25 16:12:26 UTC +Source Timestamp: 2007/05/27 16:27:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xen-2.6.21.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.21.src.rpm." + echo "The kernel-xen-2.6.22_rc2_git7.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc2_git7.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -259,7 +259,7 @@ cat > .kernel-binary.spec.buildenv <<EOF # Override the timestamp 'uname -v' reports with the build # timestamp. -export BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" +export KBUILD_BUILD_TIMESTAMP="$(head -n 1 %_sourcedir/build-source-timestamp)" # The following branch/timestamp will end up in Oopses. export OOPS_TIMESTAMP="$( echo -n $(sed -ne 's/^CVS Branch: \(.*\)/\1-/p' \ @@ -515,6 +515,87 @@ %files -f kernel.files %changelog +* Sun May 27 2007 - bwalle@suse.de +- Update config files: enable MMC_TIFM_SD=m, TIFM_7XX1=m nad + TIFM_CORE. +* Sat May 26 2007 - bwalle@suse.de +- config/i386/{bigsmp,debug,default,vanilla}, + config/x86_64/{default,debug,vanilla}: + enable CONFIG_RELOCATABLE=y +* Sat May 26 2007 - schwab@suse.de +- Remove obsolete patch ppc-ps3-gelic_2621.patch. +* Sat May 26 2007 - schwab@suse.de +- s2io-longlong: Avoid switch on long long. +* Sat May 26 2007 - schwab@suse.de +- Reenable macintosh drivers. +* Sat May 26 2007 - gregkh@suse.de +- patch tree refresh for fuzz cleanups due to new kernel version. +* Sat May 26 2007 - gregkh@suse.de +- Fix up the vanilla config files +* Sat May 26 2007 - schwab@suse.de +- Update kdb patches. +* Sat May 26 2007 - schwab@suse.de +- Update mol patches. +* Sat May 26 2007 - schwab@suse.de +- ppc-efika-of_device-generic-uevent.patch: remove obsolete stuff. +* Sat May 26 2007 - jeffm@suse.de +- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix. +* Fri May 25 2007 - jeffm@suse.de +- Updated to 2.6.22-rc2-git7: + - Removed due to upstream inclusion: + - patches.arch/ppc-generic-check_legacy_ioport.patch + - patches.arch/ppc-pci-hostbridge-window.patch + - patches.arch/ppc-macio-modalias.patch + - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch + - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff + - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff + - patches.arch/ppc-ps3-ps3fb.patch + - patches.arch/ppc-spufs.patch + - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch + - patches.arch/acpi_ibm_notify.patch + - patches.arch/ppc-of_device-modalias.patch + - patches.drivers/libata-hardreset-on-SERR_INTERNAL + - patches.drivers/cciss-add-SG_IO + - patches.drivers/ati-rs400_200-480-disable-msi + - patches.fixes/maybe_unused.patch + - patches.fixes/nfs-readdir-timestamp + - patches.fixes/dm_check_device_area.diff + - patches.rpmify/build-timestamp + - patches.suse/add-IV-generation-method-null-to-dm-crypt + - patches.suse/ams-silent-failure.patch + - patches.xen/pmd-shared.patch + - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch + - patches.apparmor/proc_setattr.diff + - patches.apparmor/proc_sys_setattr.diff + - Adjusted context: + - patches.arch/ppc-efika-bestcomm-ethernet.patch + - patches.arch/ppc-efika-of_device-generic-uevent.patch + - patches.drivers/libata-ata_piix-vmw-ign-DMA-err + - patches.fixes/tiocgdev + - patches.kernel.org/patch-2.6.22-rc2 + - patches.kernel.org/patch-2.6.22-rc2-git7 + - patches.rpmify/buildhost + - patches.suse/suse-ppc32-mol-kbuild.patch + - patches.suse/kdb-i386 + - patches.suse/acpi-hotkeys-extra.diff + - patches.suse/bootsplash + - patches.suse/kdb-common + - patches.suse/kdb-ia64 + - patches.suse/scsi-error-test-unit-ready-timeout + - patches.suse/supported-flag + - patches.suse/netfilter-ipt_LOG-mac + - patches.xen/net-csum.patch + - patches.xen/softlockup-no-idle-hz.patch + - rpm/kernel-binary.spec.in + - patches.apparmor/remove_suid.diff + - patches.apparmor/security-xattr-file.diff + - patches.apparmor/vfs-getxattr.diff + - patches.apparmor/vfs-listxattr.diff + - patches.apparmor/vfs-notify_change.diff + - Update config files. + - patches.apparmor/remove_suid_new_case_in_2.6.22.diff: apparmor: + work around new should_remove_suid() case. + - Disabled Xen until patchset can be merged. * Fri May 25 2007 - olh@suse.de - update ps3 patches new storage driver provides /dev/ps3da instead of /dev/sda ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-05-25 18:14:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-05-27 18:40:08.000000000 +0200 @@ -1 +1 @@ -2007/05/25 16:12:26 UTC +2007/05/27 16:27:23 UTC ++++++ config.tar.bz2 ++++++ ++++ 29215 lines of diff (skipped) ++++++ kabi.tar.bz2 ++++++ ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++ 2178 lines of diff (skipped) ++++++ patches.arch.tar.bz2 ++++++ ++++ 6324 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/always-announce-new-usb-devices.patch new/patches.drivers/always-announce-new-usb-devices.patch --- old/patches.drivers/always-announce-new-usb-devices.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/always-announce-new-usb-devices.patch 2007-05-26 11:06:20.000000000 +0200 @@ -13,9 +13,9 @@ drivers/usb/core/hub.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) ---- linux-2.6.20.orig/drivers/usb/core/hub.c -+++ linux-2.6.20/drivers/usb/core/hub.c -@@ -1238,7 +1238,6 @@ void usb_disconnect(struct usb_device ** +--- linux-2.6.21.orig/drivers/usb/core/hub.c ++++ linux-2.6.21/drivers/usb/core/hub.c +@@ -1235,7 +1235,6 @@ void usb_disconnect(struct usb_device ** put_device(&udev->dev); } @@ -23,7 +23,7 @@ static void show_string(struct usb_device *udev, char *id, char *string) { if (!string) -@@ -1246,10 +1245,6 @@ static void show_string(struct usb_devic +@@ -1243,10 +1242,6 @@ static void show_string(struct usb_devic dev_printk(KERN_INFO, &udev->dev, "%s: %s\n", id, string); } @@ -34,7 +34,7 @@ #ifdef CONFIG_USB_OTG -@@ -1298,7 +1293,10 @@ int usb_new_device(struct usb_device *ud +@@ -1295,7 +1290,10 @@ int usb_new_device(struct usb_device *ud udev->serial = usb_cache_string(udev, udev->descriptor.iSerialNumber); /* Tell the world! */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ati-rs400_200-480-disable-msi new/patches.drivers/ati-rs400_200-480-disable-msi --- old/patches.drivers/ati-rs400_200-480-disable-msi 2007-04-16 07:11:26.000000000 +0200 +++ new/patches.drivers/ati-rs400_200-480-disable-msi 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Tejun Heo <htejun@gmail.com> -Subject: [PATCH] pci-quirks: disable MSI on RS400-200 and RS480 -References: 263893 -Patch-Mainline: Submitted - -MSI doesn't work on RS400-200 and RS480 requiring pci=nomsi kernel -boot parameter for ahci to work. This patch disables MSI on those -chips. - - http://thread.gmane.org/gmane.linux.ide/17516 - https://bugzilla.novell.com/show_bug.cgi?id=263893 - -Signed-off-by: Tejun Heo <htejun@gmail.com> ---- - drivers/pci/quirks.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: linux-2.6.20/drivers/pci/quirks.c -=================================================================== ---- linux-2.6.20.orig/drivers/pci/quirks.c -+++ linux-2.6.20/drivers/pci/quirks.c -@@ -1761,6 +1761,8 @@ static void __devinit quirk_disable_msi( - } - } - DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_msi); -+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_msi); - - /* Go through the list of Hypertransport capabilities and - * return 1 if a HT MSI capability is found and enabled */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/cciss-add-SG_IO new/patches.drivers/cciss-add-SG_IO --- old/patches.drivers/cciss-add-SG_IO 2007-04-05 12:34:22.000000000 +0200 +++ new/patches.drivers/cciss-add-SG_IO 1970-01-01 01:00:00.000000000 +0100 @@ -1,185 +0,0 @@ -From: Hannes Reinecke <hare@suse.de> -Subject: Add SG_IO to cciss - -This patch adds support for the SG_IO ioctl to cciss. This is -required to get scsi_id and persistent device naming working -on this device. - -Index: linux-2.6.20/drivers/block/cciss.c -=================================================================== ---- linux-2.6.20.orig/drivers/block/cciss.c -+++ linux-2.6.20/drivers/block/cciss.c -@@ -45,6 +45,9 @@ - #include <linux/blkdev.h> - #include <linux/genhd.h> - #include <linux/completion.h> -+#include <scsi/scsi.h> -+#include <scsi/scsi_ioctl.h> -+#include <scsi/sg.h> - - #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin)) - #define DRIVER_NAME "HP CISS Driver (v 3.6.14)" -@@ -1152,6 +1155,163 @@ static int cciss_ioctl(struct inode *ino - kfree(ioc); - return status; - } -+ case SG_IO: { -+ struct sg_io_hdr hdr; -+ CommandList_struct *c; -+ char *buff = NULL; -+ u64bit temp64; -+ unsigned long flags; -+ DECLARE_COMPLETION_ONSTACK(wait); -+ -+ if (!capable(CAP_SYS_RAWIO)) -+ return -EPERM; -+ -+ if (copy_from_user(&hdr, argp, sizeof(hdr))) -+ return -EFAULT; -+ -+ if (hdr.interface_id != 'S') -+ return -EINVAL; -+ -+ /* cciss only supports 16-byte commands */ -+ if (hdr.cmd_len > 16) -+ return -EINVAL; -+ -+ /* We don't support proper scatter-gather (yet) */ -+ if (hdr.iovec_count) -+ return -EINVAL; -+ -+ if ((hdr.dxfer_len < 1) && -+ (hdr.dxfer_direction != SG_DXFER_NONE)) -+ return -EINVAL; -+ -+ if (hdr.dxfer_len > 0) { -+ buff = kmalloc(hdr.dxfer_len, GFP_KERNEL); -+ if (buff == NULL) -+ return -EFAULT; -+ } -+ if ((hdr.dxfer_direction == SG_DXFER_TO_DEV) || -+ (hdr.dxfer_direction == SG_DXFER_TO_FROM_DEV)) { -+ /* Copy the data into the buffer we created */ -+ if (copy_from_user (buff, hdr.dxferp, -+ hdr.dxfer_len)) { -+ kfree(buff); -+ return -EFAULT; -+ } -+ } else -+ memset(buff, 0, hdr.dxfer_len); -+ -+ if ((c = cmd_alloc(host, 0)) == NULL) { -+ kfree(buff); -+ return -ENOMEM; -+ } -+ -+ /* Copy CDB */ -+ if (copy_from_user(c->Request.CDB, hdr.cmdp, hdr.cmd_len)) -+ return -EFAULT; -+ -+ /* Fill in the command type */ -+ c->cmd_type = CMD_IOCTL_PEND; -+ /* Fill in Command Header */ -+ c->Header.ReplyQueue = 0; -+ if (hdr.dxfer_len > 0) { -+ c->Header.SGList = 1; -+ c->Header.SGTotal = 1; -+ } else { -+ c->Header.SGList = 0; -+ c->Header.SGTotal = 0; -+ } -+ /* Default to LUN the ioctl was directed to */ -+ c->Header.LUN.LogDev.VolId = drv->LunID & 0x3FFFFFFF; -+ c->Header.LUN.LogDev.Mode = 0x01; /* Logical volume */ -+ c->Header.Tag.lower = c->busaddr; -+ -+ /* Fill in Request block */ -+ c->Request.CDBLen = hdr.cmd_len; -+ c->Request.Type.Type = TYPE_CMD; -+ c->Request.Type.Attribute = ATTR_SIMPLE; -+ switch(hdr.dxfer_direction) { -+ case SG_DXFER_NONE: -+ c->Request.Type.Direction = XFER_NONE; -+ break; -+ case SG_DXFER_TO_DEV: -+ c->Request.Type.Direction = XFER_WRITE; -+ break; -+ case SG_DXFER_FROM_DEV: -+ c->Request.Type.Direction = XFER_READ; -+ break; -+ case SG_DXFER_TO_FROM_DEV: -+ c->Request.Type.Direction = XFER_RSVD; -+ break; -+ } -+ c->Request.Timeout = hdr.timeout; -+ -+ /* Fill in the scatter gather information */ -+ if (hdr.dxfer_len > 0) { -+ temp64.val = pci_map_single(host->pdev, buff, -+ hdr.dxfer_len, -+ PCI_DMA_BIDIRECTIONAL); -+ c->SG[0].Addr.lower = temp64.val32.lower; -+ c->SG[0].Addr.upper = temp64.val32.upper; -+ c->SG[0].Len = hdr.dxfer_len; -+ c->SG[0].Ext = 0; -+ } -+ c->waiting = &wait; -+ -+ /* Put the request on the tail of the request queue */ -+ spin_lock_irqsave(CCISS_LOCK(ctlr), flags); -+ addQ(&host->reqQ, c); -+ host->Qdepth++; -+ start_io(host); -+ spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags); -+ -+ wait_for_completion(&wait); -+ -+ /* unlock the buffers from DMA */ -+ temp64.val32.lower = c->SG[0].Addr.lower; -+ temp64.val32.upper = c->SG[0].Addr.upper; -+ pci_unmap_single(host->pdev, (dma_addr_t) temp64.val, -+ hdr.dxfer_len, -+ PCI_DMA_BIDIRECTIONAL); -+ -+ /* Copy the error information out */ -+ hdr.status = c->err_info->ScsiStatus; -+ if (c->err_info->SenseLen && hdr.mx_sb_len > 0) { -+ int sense_len = c->err_info->SenseLen; -+ -+ if (sense_len > hdr.mx_sb_len) -+ sense_len = hdr.mx_sb_len; -+ -+ if (copy_to_user(hdr.sbp, c->err_info->SenseInfo, -+ sense_len)) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ hdr.sb_len_wr = sense_len; -+ } -+ hdr.resid = c->err_info->ResidualCnt; -+ /* Copy out the header */ -+ if (copy_to_user(argp, &hdr, sizeof(hdr))) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ -+ if ((hdr.dxfer_direction == SG_DXFER_FROM_DEV) || -+ (hdr.dxfer_direction == SG_DXFER_TO_FROM_DEV)) { -+ /* Copy the data out to the buffer we created */ -+ if (copy_to_user -+ (hdr.dxferp, buff, hdr.dxfer_len)) { -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return -EFAULT; -+ } -+ } -+ -+ kfree(buff); -+ cmd_free(host, c, 0); -+ return 0; -+ } - default: - return -ENOTTY; - } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000-eeprom-cksum.patch new/patches.drivers/e1000-eeprom-cksum.patch --- old/patches.drivers/e1000-eeprom-cksum.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/e1000-eeprom-cksum.patch 2007-05-26 11:06:20.000000000 +0200 @@ -12,9 +12,9 @@ drivers/net/e1000/e1000_main.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---- linux-2.6.20.orig/drivers/net/e1000/e1000_main.c -+++ linux-2.6.20/drivers/net/e1000/e1000_main.c -@@ -1018,8 +1018,12 @@ e1000_probe(struct pci_dev *pdev, +--- linux-2.6.21.orig/drivers/net/e1000/e1000_main.c ++++ linux-2.6.21/drivers/net/e1000/e1000_main.c +@@ -1007,8 +1007,12 @@ e1000_probe(struct pci_dev *pdev, /* make sure the EEPROM is good */ if (e1000_validate_eeprom_checksum(&adapter->hw) < 0) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ata_piix-vmw-ign-DMA-err new/patches.drivers/libata-ata_piix-vmw-ign-DMA-err --- old/patches.drivers/libata-ata_piix-vmw-ign-DMA-err 2007-04-10 11:38:00.000000000 +0200 +++ new/patches.drivers/libata-ata_piix-vmw-ign-DMA-err 2007-05-26 11:06:20.000000000 +0200 @@ -8,12 +8,10 @@ Signed-off-by: Tejun Heo <teheo@suse.de> --- drivers/ata/ata_piix.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 52 insertions(+) + 1 files changed, 52 insertions(+) -Index: linux-2.6.20/drivers/ata/ata_piix.c -=================================================================== ---- linux-2.6.20.orig/drivers/ata/ata_piix.c -+++ linux-2.6.20/drivers/ata/ata_piix.c +--- linux-2.6.21.orig/drivers/ata/ata_piix.c ++++ linux-2.6.21/drivers/ata/ata_piix.c @@ -129,6 +129,7 @@ enum { ich6m_sata_ahci = 8, ich8_sata_ahci = 9, @@ -22,10 +20,10 @@ /* constants for mapping table */ P0 = 0, /* port 0 */ -@@ -160,12 +161,15 @@ static void piix_sata_error_handler(stru - static void piix_set_piomode (struct ata_port *ap, struct ata_device *adev); +@@ -159,12 +160,15 @@ static void piix_set_piomode (struct ata static void piix_set_dmamode (struct ata_port *ap, struct ata_device *adev); static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev); + static int ich_pata_cable_detect(struct ata_port *ap); +static u8 piix_vmw_bmdma_status(struct ata_port *ap); static unsigned int in_module_init = 1; @@ -38,7 +36,7 @@ /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */ /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */ { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 }, -@@ -377,6 +381,39 @@ static const struct ata_port_operations +@@ -374,6 +378,39 @@ static const struct ata_port_operations .port_start = ata_port_start, }; @@ -78,7 +76,7 @@ static const struct piix_map_db ich5_map_db = { .mask = 0x7, .port_enable = 0x3, -@@ -553,6 +590,16 @@ static struct ata_port_info piix_port_in +@@ -550,6 +587,16 @@ static struct ata_port_info piix_port_in .mwdma_mask = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */ .port_ops = &piix_pata_ops, }, @@ -95,7 +93,7 @@ }; static struct pci_bits piix_enable_bits[] = { -@@ -912,6 +959,11 @@ static void ich_set_dmamode (struct ata_ +@@ -868,6 +915,11 @@ static void ich_set_dmamode (struct ata_ do_pata_set_dmamode(ap, adev, 1); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-hardreset-on-SERR_INTERNAL new/patches.drivers/libata-hardreset-on-SERR_INTERNAL --- old/patches.drivers/libata-hardreset-on-SERR_INTERNAL 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/libata-hardreset-on-SERR_INTERNAL 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -From: Tejun Heo <htejun@gmail.com> -Subject: [PATCH] libata: hardreset on SERR_INTERNAL -References: 241334 - -There was a rare report where SB600 reported SERR_INTERNAL and SRST -couldn't get it out of the failure mode. Hardreset on SERR_INTERNAL. -As the problem is intermittent, whether this fixes the problem or not -hasn't been verified yet, but hardresetting the channel on internal -error is a good idea anyway. - -Signed-off-by: Tejun Heo <htejun@gmail.com> ---- - drivers/ata/libata-eh.c | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - ---- linux-2.6.20.orig/drivers/ata/libata-eh.c -+++ linux-2.6.20/drivers/ata/libata-eh.c -@@ -1055,7 +1055,7 @@ static void ata_eh_analyze_serror(struct - } - if (serror & SERR_INTERNAL) { - err_mask |= AC_ERR_SYSTEM; -- action |= ATA_EH_SOFTRESET; -+ action |= ATA_EH_HARDRESET; - } - if (serror & (SERR_PHYRDY_CHG | SERR_DEV_XCHG)) - ata_ehi_hotplugged(&ehc->i); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/nozomi.patch new/patches.drivers/nozomi.patch --- old/patches.drivers/nozomi.patch 2007-03-21 19:52:23.000000000 +0100 +++ new/patches.drivers/nozomi.patch 2007-05-26 11:06:20.000000000 +0200 @@ -20,9 +20,9 @@ drivers/char/nozomi.c | 2251 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2262 insertions(+) ---- a/drivers/char/Kconfig -+++ b/drivers/char/Kconfig -@@ -372,6 +372,16 @@ config ISTALLION +--- linux-2.6.21.orig/drivers/char/Kconfig ++++ linux-2.6.21/drivers/char/Kconfig +@@ -374,6 +374,16 @@ config ISTALLION To compile this driver as a module, choose M here: the module will be called istallion. @@ -39,8 +39,8 @@ config AU1000_UART bool "Enable Au1000 UART Support" depends on SERIAL_NONSTANDARD && MIPS ---- a/drivers/char/Makefile -+++ b/drivers/char/Makefile +--- linux-2.6.21.orig/drivers/char/Makefile ++++ linux-2.6.21/drivers/char/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_SERIAL167) += serial167.o obj-$(CONFIG_CYCLADES) += cyclades.o obj-$(CONFIG_STALLION) += stallion.o @@ -50,7 +50,7 @@ obj-$(CONFIG_SPECIALIX) += specialix.o obj-$(CONFIG_MOXA_INTELLIO) += moxa.o --- /dev/null -+++ b/drivers/char/nozomi.c ++++ linux-2.6.21/drivers/char/nozomi.c @@ -0,0 +1,2251 @@ +/* nozomi.c -- HSDPA driver Broadband Wireless Data Card - Globe Trotter +* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ppc64-adb new/patches.drivers/ppc64-adb --- old/patches.drivers/ppc64-adb 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.drivers/ppc64-adb 2007-05-26 11:06:20.000000000 +0200 @@ -9,8 +9,8 @@ drivers/macintosh/adbhid.c | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) ---- linux-2.6.19.orig/drivers/macintosh/adb.c -+++ linux-2.6.19/drivers/macintosh/adb.c +--- linux-2.6.21.orig/drivers/macintosh/adb.c ++++ linux-2.6.21/drivers/macintosh/adb.c @@ -296,6 +296,10 @@ int __init adb_init(void) if (!machine_is(chrp) && !machine_is(powermac)) return 0; @@ -22,8 +22,8 @@ #ifdef CONFIG_MAC if (!MACH_IS_MAC) return 0; ---- linux-2.6.19.orig/drivers/macintosh/adbhid.c -+++ linux-2.6.19/drivers/macintosh/adbhid.c +--- linux-2.6.21.orig/drivers/macintosh/adbhid.c ++++ linux-2.6.21/drivers/macintosh/adbhid.c @@ -1180,10 +1180,14 @@ init_ms_a3(int id) static int __init adbhid_init(void) @@ -40,9 +40,9 @@ led_request.complete = 1; ---- linux-2.6.19.orig/drivers/macintosh/Kconfig -+++ linux-2.6.19/drivers/macintosh/Kconfig -@@ -4,7 +4,7 @@ menu "Macintosh device drivers" +--- linux-2.6.21.orig/drivers/macintosh/Kconfig ++++ linux-2.6.21/drivers/macintosh/Kconfig +@@ -8,7 +8,7 @@ if MACINTOSH_DRIVERS config ADB bool "Apple Desktop Bus (ADB) support" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/sysfs-crash-debugging.patch new/patches.drivers/sysfs-crash-debugging.patch --- old/patches.drivers/sysfs-crash-debugging.patch 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.drivers/sysfs-crash-debugging.patch 2007-05-26 11:06:20.000000000 +0200 @@ -24,9 +24,9 @@ include/linux/sysfs.h | 7 +++++++ 4 files changed, 21 insertions(+) ---- linux-2.6.20.orig/arch/i386/kernel/traps.c -+++ linux-2.6.20/arch/i386/kernel/traps.c -@@ -429,6 +429,7 @@ void die(const char * str, struct pt_reg +--- linux-2.6.21.orig/arch/i386/kernel/traps.c ++++ linux-2.6.21/arch/i386/kernel/traps.c +@@ -415,6 +415,7 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); @@ -34,9 +34,9 @@ if (notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) { ---- linux-2.6.20.orig/arch/x86_64/kernel/traps.c -+++ linux-2.6.20/arch/x86_64/kernel/traps.c -@@ -533,6 +533,7 @@ void __kprobes __die(const char * str, s +--- linux-2.6.21.orig/arch/x86_64/kernel/traps.c ++++ linux-2.6.21/arch/x86_64/kernel/traps.c +@@ -515,6 +515,7 @@ void __kprobes __die(const char * str, s printk("DEBUG_PAGEALLOC"); #endif printk("\n"); @@ -44,8 +44,8 @@ notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ ---- linux-2.6.20.orig/fs/sysfs/file.c -+++ linux-2.6.20/fs/sysfs/file.c +--- linux-2.6.21.orig/fs/sysfs/file.c ++++ linux-2.6.21/fs/sysfs/file.c @@ -6,6 +6,7 @@ #include <linux/fsnotify.h> #include <linux/kobject.h> @@ -54,9 +54,9 @@ #include <linux/poll.h> #include <linux/list.h> #include <asm/uaccess.h> -@@ -16,6 +17,9 @@ - #define to_subsys(k) container_of(k,struct subsystem,kset.kobj) - #define to_sattr(a) container_of(a,struct subsys_attribute,attr) +@@ -15,6 +16,9 @@ + + #define to_sattr(a) container_of(a,struct subsys_attribute, attr) +/* used in crash dumps to help with debugging */ +static char last_sysfs_file[PATH_MAX]; @@ -64,7 +64,7 @@ /* * Subsystem file operations. * These operations allow subsystems to have files that can be -@@ -283,6 +287,9 @@ static int sysfs_open_file(struct inode +@@ -253,6 +257,9 @@ static int sysfs_open_file(struct inode struct sysfs_buffer * buffer; struct sysfs_ops * ops = NULL; int error = 0; @@ -74,7 +74,7 @@ if (!kobj || !attr) goto Einval; -@@ -368,6 +375,11 @@ static int sysfs_open_file(struct inode +@@ -338,6 +345,11 @@ static int sysfs_open_file(struct inode return error; } @@ -86,8 +86,8 @@ static int sysfs_release(struct inode * inode, struct file * filp) { struct kobject * kobj = to_kobj(filp->f_path.dentry->d_parent); ---- linux-2.6.20.orig/include/linux/sysfs.h -+++ linux-2.6.20/include/linux/sysfs.h +--- linux-2.6.21.orig/include/linux/sysfs.h ++++ linux-2.6.21/include/linux/sysfs.h @@ -134,6 +134,8 @@ extern void sysfs_remove_shadow_dir(stru extern int __must_check sysfs_init(void); ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_execute_notify_threaded.patch new/patches.fixes/acpi_execute_notify_threaded.patch --- old/patches.fixes/acpi_execute_notify_threaded.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/acpi_execute_notify_threaded.patch 2007-03-22 12:10:29.000000000 +0100 @@ -0,0 +1,144 @@ +From: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> +Subject: Acpi: created a dedicated workqueue for notify() execution +Patch-mainline: not yet +References: http://bugzilla.kernel.org/show_bug.cgi?id=5534 + +Signed-off-by: Thomas Renninger <trenn@suse.de> + + +HP nx6125/nx6325/... machines have a _GPE handler with an infinite +loop sending Notify() events to different ACPI subsystems. + +Notify handler in ACPI driver is a C-routine, which may call ACPI +interpreter again to get access to some ACPI variables +(acpi_evaluate_xxx). +On these HP machines such an evaluation changes state of some variable +and lets the loop above break. + +In the current ACPI implementation Notify requests are being deferred +to the same kacpid workqueue on which the above GPE handler with +infinite loop is executing. Thus we have a deadlock -- loop will +continue to spin, sending notify events, and at the same time +preventing these notify events from being run on a workqueue. All +notify events are deferred, thus we see increase in memory consumption +noticed by author of the thread. Also as GPE handling is bloked, +machines overheat. Eventually by external poll of the same +acpi_evaluate, kacpid is released and all the queued notify events are +free to run, thus 100% cpu utilization by kacpid for several seconds +or more. + +To prevent all these horrors it's needed to not put notify events to +kacpid workqueue by either executing them immediately or putting them +on some other thread. It's dangerous to execute notify events in +place, as it will put several ACPI interpreter stacks on top of each +other (at least 4 in case of nx6125), thus causing kernel stack +overflow. + +First attempt to create a new thread was done by Peter Wainwright +He created a bunch of threads, which were stealing work from a kacpid +workqueue. +This patch appeared in 2.6.15 kernel shipped with Ubuntu 6.06 LTS. + +Second attempt was done by me, I created a new thread for each Notify +event. This worked OK on HP nx machines, but broke Linus' Compaq +n620c, by producing threads with a speed what they stopped the machine +completely. Thus this patch was reverted from 18-rc2 as I remember. +I re-made the patch to create second workqueue just for notify events, +thus hopping it will not break Linus' machine. Patch was tested on the +same HP nx machines in #5534 and #7122, but I did not received reply +from Linus on a test patch sent to him. +Patch went to 19-rc and was rejected with much fanfare again. +There was 4th patch, which inserted schedule_timeout(1) into deferred +execution of kacpid, if we had any notify requests pending, but Linus +decided that it was too complex (involved either changes to workqueue +to see if it's empty or atomic inc/dec). +Now you see last variant which adds yield() to every GPE execution. +http://bugzilla.kernel.org/show_bug.cgi?id=5534 + drivers/acpi/osl.c | 43 ++++++++++++++++++++++++++++++++++++------- + 1 files changed, 36 insertions(+), 7 deletions(-) + +--- linux-2.6.20.orig/drivers/acpi/osl.c ++++ linux-2.6.20/drivers/acpi/osl.c +@@ -76,6 +76,7 @@ static unsigned int acpi_irq_irq; + static acpi_osd_handler acpi_irq_handler; + static void *acpi_irq_context; + static struct workqueue_struct *kacpid_wq; ++static struct workqueue_struct *kacpi_notify_wq; + + static void __init acpi_request_region (struct acpi_generic_address *addr, + unsigned int length, char *desc) +@@ -142,8 +143,9 @@ acpi_status acpi_os_initialize1(void) + return AE_NULL_ENTRY; + } + kacpid_wq = create_singlethread_workqueue("kacpid"); ++ kacpi_notify_wq = create_singlethread_workqueue("kacpi_notify"); + BUG_ON(!kacpid_wq); +- ++ BUG_ON(!kacpi_notify_wq); + return AE_OK; + } + +@@ -155,6 +157,7 @@ acpi_status acpi_os_terminate(void) + } + + destroy_workqueue(kacpid_wq); ++ destroy_workqueue(kacpi_notify_wq); + + return AE_OK; + } +@@ -733,9 +736,27 @@ static void acpi_os_execute_deferred(str + + kfree(dpc); + ++ /* Yield cpu to notify thread */ ++ cond_resched(); ++ ++ return; ++} ++ ++static void acpi_os_execute_notify(struct work_struct *work) ++{ ++ struct acpi_os_dpc *dpc = container_of(work, struct acpi_os_dpc, work); ++ if (!dpc) { ++ printk(KERN_ERR PREFIX "Invalid (NULL) context\n"); ++ return; ++ } ++ ++ dpc->function(dpc->context); ++ kfree(dpc); ++ + return; + } + ++ + /******************************************************************************* + * + * FUNCTION: acpi_os_execute +@@ -782,13 +803,21 @@ acpi_status acpi_os_execute(acpi_execute + dpc->function = function; + dpc->context = context; + +- INIT_WORK(&dpc->work, acpi_os_execute_deferred); +- if (!queue_work(kacpid_wq, &dpc->work)) { +- ACPI_DEBUG_PRINT((ACPI_DB_ERROR, +- "Call to queue_work() failed.\n")); +- kfree(dpc); +- status = AE_ERROR; ++ if (type == OSL_NOTIFY_HANDLER) { ++ INIT_WORK(&dpc->work, acpi_os_execute_notify); ++ if (!queue_work(kacpi_notify_wq, &dpc->work)) { ++ kfree(dpc); ++ status = AE_ERROR; ++ } + } ++ else { ++ INIT_WORK(&dpc->work, acpi_os_execute_deferred); ++ if (!queue_work(kacpid_wq, &dpc->work)) { ++ kfree(dpc); ++ status = AE_ERROR; ++ } ++ } ++ + + return_ACPI_STATUS(status); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_force-fan-active.patch new/patches.fixes/acpi_force-fan-active.patch --- old/patches.fixes/acpi_force-fan-active.patch 2007-02-15 14:42:39.000000000 +0100 +++ new/patches.fixes/acpi_force-fan-active.patch 2007-05-26 11:06:20.000000000 +0200 @@ -7,13 +7,11 @@ --- drivers/acpi/thermal.c | 6 ++++++ - 1 file changed, 6 insertions(+) + 1 files changed, 6 insertions(+) -Index: linux-2.6.20/drivers/acpi/thermal.c -=================================================================== ---- linux-2.6.20.orig/drivers/acpi/thermal.c -+++ linux-2.6.20/drivers/acpi/thermal.c -@@ -605,8 +605,14 @@ static void acpi_thermal_active(struct a +--- linux-2.6.21.orig/drivers/acpi/thermal.c ++++ linux-2.6.21/drivers/acpi/thermal.c +@@ -593,8 +593,14 @@ static void acpi_thermal_active(struct a if (active->temperature > maxtemp) tz->state.active_index = i; maxtemp = active->temperature; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/dm_check_device_area.diff new/patches.fixes/dm_check_device_area.diff --- old/patches.fixes/dm_check_device_area.diff 2006-09-20 20:33:08.000000000 +0200 +++ new/patches.fixes/dm_check_device_area.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ -Subject: dm:check_device_area fails on DASD devices during table create -From: Mike Anderson <andmike@us.ibm.com> -References: 158777 - LTC22470 - -Allow check_device_area to succeed if a device has an i_size of zero. This -addresses an issue seen on DASD devices setting up a multipath table for -paths in online and offline state. - -Signed-off-by: Mike Anderson <andmike@us.ibm.com> -Signed-off-by: Hannes Reinecke <hare@suse.de> - - drivers/md/dm-table.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletion(-) - ---- linux-2.6.18.orig/drivers/md/dm-table.c -+++ linux-2.6.18/drivers/md/dm-table.c -@@ -432,7 +432,8 @@ static int check_device_area(struct dm_d - { - sector_t dev_size; - dev_size = dd->bdev->bd_inode->i_size >> SECTOR_SHIFT; -- return ((start < dev_size) && (len <= (dev_size - start))); -+ return dev_size ? -+ ((start < dev_size) && (len <= (dev_size - start))) : 1; - } - - /* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-no-autoconf new/patches.fixes/ipv6-no-autoconf --- old/patches.fixes/ipv6-no-autoconf 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/ipv6-no-autoconf 2007-05-26 11:06:20.000000000 +0200 @@ -17,17 +17,17 @@ net/ipv6/addrconf.c | 2 ++ 1 files changed, 2 insertions(+) ---- linux-2.6.20.orig/net/ipv6/addrconf.c -+++ linux-2.6.20/net/ipv6/addrconf.c -@@ -2489,6 +2489,7 @@ static void addrconf_dad_start(struct in +--- linux-2.6.21.orig/net/ipv6/addrconf.c ++++ linux-2.6.21/net/ipv6/addrconf.c +@@ -2589,6 +2589,7 @@ static void addrconf_dad_start(struct in spin_lock_bh(&ifp->lock); if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) || + !(dev->flags&IFF_MULTICAST) || !(ifp->flags&IFA_F_TENTATIVE) || ifp->flags & IFA_F_NODAD) { - ifp->flags &= ~IFA_F_TENTATIVE; -@@ -2574,6 +2575,7 @@ static void addrconf_dad_completed(struc + ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC); +@@ -2682,6 +2683,7 @@ static void addrconf_dad_completed(struc if (ifp->idev->cnf.forwarding == 0 && ifp->idev->cnf.rtr_solicits > 0 && (dev->flags&IFF_LOOPBACK) == 0 && diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/loop-barriers new/patches.fixes/loop-barriers --- old/patches.fixes/loop-barriers 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.fixes/loop-barriers 2007-05-26 11:06:20.000000000 +0200 @@ -14,9 +14,9 @@ drivers/block/loop.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+) ---- linux-2.6.19.orig/drivers/block/loop.c -+++ linux-2.6.19/drivers/block/loop.c -@@ -199,6 +199,38 @@ lo_do_transfer(struct loop_device *lo, i +--- linux-2.6.21.orig/drivers/block/loop.c ++++ linux-2.6.21/drivers/block/loop.c +@@ -198,6 +198,38 @@ lo_do_transfer(struct loop_device *lo, i return lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock); } @@ -55,7 +55,7 @@ /** * do_lo_send_aops - helper for writing data to a loop device * -@@ -211,11 +243,18 @@ static int do_lo_send_aops(struct loop_d +@@ -210,11 +242,18 @@ static int do_lo_send_aops(struct loop_d struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */ struct address_space *mapping = file->f_mapping; const struct address_space_operations *aops = mapping->a_ops; @@ -74,7 +74,7 @@ index = pos >> PAGE_CACHE_SHIFT; offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1); bv_offs = bvec->bv_offset; -@@ -277,6 +316,15 @@ static int do_lo_send_aops(struct loop_d +@@ -272,6 +311,15 @@ static int do_lo_send_aops(struct loop_d page_cache_release(page); } ret = 0; @@ -90,7 +90,7 @@ out: mutex_unlock(&mapping->host->i_mutex); return ret; -@@ -758,6 +806,9 @@ static int loop_set_fd(struct loop_devic +@@ -753,6 +801,9 @@ static int loop_set_fd(struct loop_devic if (!(file->f_mode & FMODE_WRITE)) lo_flags |= LO_FLAGS_READ_ONLY; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/loop-barriers2 new/patches.fixes/loop-barriers2 --- old/patches.fixes/loop-barriers2 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.fixes/loop-barriers2 2007-05-26 11:06:20.000000000 +0200 @@ -8,9 +8,9 @@ drivers/block/loop.c | 12 ++++++++++++ 1 files changed, 12 insertions(+) ---- linux-2.6.19.orig/drivers/block/loop.c -+++ linux-2.6.19/drivers/block/loop.c -@@ -519,12 +519,24 @@ static int do_bio_filebacked(struct loop +--- linux-2.6.21.orig/drivers/block/loop.c ++++ linux-2.6.21/drivers/block/loop.c +@@ -514,12 +514,24 @@ static int do_bio_filebacked(struct loop { loff_t pos; int ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/maybe_unused.patch new/patches.fixes/maybe_unused.patch --- old/patches.fixes/maybe_unused.patch 2007-05-23 11:44:04.000000000 +0200 +++ new/patches.fixes/maybe_unused.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -commit 0d7ebbbc6eaa5539f78ab20ed6ff1725a4e332ef -Author: David Rientjes <rientjes@google.com> -Date: Wed May 9 02:35:27 2007 -0700 -Patch-mainline: 2.6.22 - - compiler: introduce __used and __maybe_unused - - __used is defined to be __attribute__((unused)) for all pre-3.3 gcc - compilers to suppress warnings for unused functions because perhaps they - are referenced only in inline assembly. It is defined to be - __attribute__((used)) for gcc 3.3 and later so that the code is still - emitted for such functions. - - __maybe_unused is defined to be __attribute__((unused)) for both function - and variable use if it could possibly be unreferenced due to the evaluation - of preprocessor macros. Function prototypes shall be marked with - __maybe_unused if the actual definition of the function is dependant on - preprocessor macros. - - No update to compiler-intel.h is necessary because ICC supports both - __attribute__((used)) and __attribute__((unused)) as specified by the gcc - manual. - - __attribute_used__ is deprecated and will be removed once all current - code is converted to using __used. - - Cc: Rusty Russell <rusty@rustcorp.com.au> - Cc: Adrian Bunk <bunk@stusta.de> - Signed-off-by: David Rientjes <rientjes@google.com> - Signed-off-by: Andrew Morton <akpm@linux-foundation.org> - Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index a9f7947..03ec231 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -40,3 +40,4 @@ #define __printf(a,b) __attribute__((f - #define noinline __attribute__((noinline)) - #define __attribute_pure__ __attribute__((pure)) - #define __attribute_const__ __attribute__((__const__)) -+#define __maybe_unused __attribute__((unused)) - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs-readdir-timestamp new/patches.fixes/nfs-readdir-timestamp --- old/patches.fixes/nfs-readdir-timestamp 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/nfs-readdir-timestamp 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -From: NeilBrown <neilb@suse.de> -Subject: Set meaningful value for fattr->time_start in readdirplus results. -Patch-mainline: no -References: 244967 - - -The 'fattr' structure filled in by nfs3_decode_direct does not get a -value for ->time_start set. -Thus if an entry is for an inode that we already have in cache, -when nfs_readdir_lookup calls nfs_fhget, it will call nfs_refresh_inode -and may update the inode with out-of-date information. - -Directories are read a page at a time, so each page could have a -different timestamp that "should" be used to set the time_start for -the fattr for info in that page. However storing the timestamp per -page is awkward. (We could stick in the first 4 bytes and only read 4092 -bytes, but that is a bigger code change than I was interested it). - -This patch records the timestamp when the first page of a directory is -read and uses it to set the time_start for the fattr for each each -entry read from the directory. This if an inode has been updated more -recently than the directory was read, that information will not be -destroyed. - -Signed-off-by: Neil Brown <neilb@suse.de> - -### Diffstat output - fs/nfs/dir.c | 4 ++++ - 1 files changed, 4 insertions(+) - -Acked-by: - -diff .prev/fs/nfs/dir.c ./fs/nfs/dir.c ---- linux-2.6.20.orig/fs/nfs/dir.c -+++ linux-2.6.20/fs/nfs/dir.c -@@ -154,6 +154,7 @@ typedef struct { - decode_dirent_t decode; - int plus; - int error; -+ unsigned long timestamp; - } nfs_readdir_descriptor_t; - - /* Now we cache directories properly, by stuffing the dirent -@@ -207,6 +208,8 @@ int nfs_readdir_filler(nfs_readdir_descr - /* Should never happen */ - nfs_zap_mapping(inode, inode->i_mapping); - } -+ if (page->index == 0) -+ desc->timestamp = timestamp; - unlock_page(page); - return 0; - error: -@@ -1151,6 +1154,7 @@ static struct dentry *nfs_readdir_lookup - if (dentry == NULL) - return NULL; - dentry->d_op = NFS_PROTO(dir)->dentry_ops; -+ entry->fattr->time_start = desc->timestamp; - inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr); - if (IS_ERR(inode)) { - dput(dentry); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/oom-warning new/patches.fixes/oom-warning --- old/patches.fixes/oom-warning 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/oom-warning 2007-05-26 11:06:20.000000000 +0200 @@ -11,9 +11,9 @@ mm/page_alloc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) ---- linux-2.6.20.orig/mm/page_alloc.c -+++ linux-2.6.20/mm/page_alloc.c -@@ -1390,7 +1390,13 @@ nofail_alloc: +--- linux-2.6.21.orig/mm/page_alloc.c ++++ linux-2.6.21/mm/page_alloc.c +@@ -1363,7 +1363,13 @@ nofail_alloc: nopage: if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/parport-mutex new/patches.fixes/parport-mutex --- old/patches.fixes/parport-mutex 2006-08-29 11:13:02.000000000 +0200 +++ new/patches.fixes/parport-mutex 2007-05-26 11:06:20.000000000 +0200 @@ -23,11 +23,9 @@ drivers/char/lp.c | 3 +++ 1 files changed, 3 insertions(+) -Index: build/drivers/char/lp.c -=================================================================== ---- build.orig/drivers/char/lp.c -+++ build/drivers/char/lp.c -@@ -616,9 +616,12 @@ static int lp_ioctl(struct inode *inode, +--- linux-2.6.21.orig/drivers/char/lp.c ++++ linux-2.6.21/drivers/char/lp.c +@@ -612,9 +612,12 @@ static int lp_ioctl(struct inode *inode, return -EFAULT; break; case LPGETSTATUS: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/remount-no-shrink-dcache new/patches.fixes/remount-no-shrink-dcache --- old/patches.fixes/remount-no-shrink-dcache 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.fixes/remount-no-shrink-dcache 2007-05-26 11:06:20.000000000 +0200 @@ -12,9 +12,9 @@ fs/super.c | 36 +++++++++++++++++++++++------------- 1 files changed, 23 insertions(+), 13 deletions(-) ---- linux-2.6.19.orig/fs/super.c -+++ linux-2.6.19/fs/super.c -@@ -576,16 +576,10 @@ static void mark_files_ro(struct super_b +--- linux-2.6.21.orig/fs/super.c ++++ linux-2.6.21/fs/super.c +@@ -577,16 +577,10 @@ static void mark_files_ro(struct super_b file_list_unlock(); } @@ -35,7 +35,7 @@ { int retval; -@@ -595,13 +589,14 @@ int do_remount_sb(struct super_block *sb +@@ -596,13 +590,14 @@ int do_remount_sb(struct super_block *sb #endif if (flags & MS_RDONLY) acct_auto_close(sb); @@ -52,7 +52,7 @@ mark_files_ro(sb); else if (!fs_may_remount_ro(sb)) return -EBUSY; -@@ -618,6 +613,21 @@ int do_remount_sb(struct super_block *sb +@@ -619,6 +614,21 @@ int do_remount_sb(struct super_block *sb return 0; } @@ -74,7 +74,7 @@ static void do_emergency_remount(unsigned long foo) { struct super_block *sb; -@@ -861,7 +871,7 @@ int get_sb_single(struct file_system_typ +@@ -850,7 +860,7 @@ int get_sb_single(struct file_system_typ } s->s_flags |= MS_ACTIVE; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/s2io-longlong new/patches.fixes/s2io-longlong --- old/patches.fixes/s2io-longlong 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/s2io-longlong 2007-05-26 10:58:47.000000000 +0200 @@ -0,0 +1,36 @@ +From: schwab@suse.de +Subject: Avoid switch on long long +Patch-mainline: submitted + +A switch on long long causes gcc to generate a reference to __ucmpdi2 on +ppc32. Avoid that by casting to int, since the value is only a small +integer anyway. + +Signed-off-by: Andreas Schwab <schwab@suse.de> + +--- + drivers/net/s2io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6.21/drivers/net/s2io.c +=================================================================== +--- linux-2.6.21.orig/drivers/net/s2io.c 2007-05-26 10:52:42.000000000 +0200 ++++ linux-2.6.21/drivers/net/s2io.c 2007-05-26 10:53:09.000000000 +0200 +@@ -2898,7 +2898,7 @@ static void tx_intr_handler(struct fifo_ + + /* update t_code statistics */ + err >>= 48; +- switch(err) { ++ switch((int)err) { + case 2: + nic->mac_control.stats_info->sw_stat. + tx_buf_abort_cnt++; +@@ -6825,7 +6825,7 @@ static int rx_osm_handler(struct ring_in + sp->mac_control.stats_info->sw_stat.parity_err_cnt++; + } + err >>= 48; +- switch(err) { ++ switch((int)err) { + case 1: + sp->mac_control.stats_info->sw_stat. + rx_parity_err_cnt++; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev --- old/patches.fixes/tiocgdev 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.fixes/tiocgdev 2007-05-26 11:06:20.000000000 +0200 @@ -5,6 +5,7 @@ add tty ioctl to figure physical device of the console. drivers/char/tty_io.c | 15 +++++++++++++++ + fs/compat_ioctl.c | 1 + include/asm-alpha/ioctls.h | 1 + include/asm-arm/ioctls.h | 1 + include/asm-i386/ioctls.h | 1 + @@ -17,16 +18,16 @@ include/asm-sparc/ioctls.h | 1 + include/asm-sparc64/ioctls.h | 1 + include/asm-x86_64/ioctls.h | 1 + - include/linux/compat_ioctl.h | 1 + 14 files changed, 28 insertions(+) ---- linux-2.6.20.orig/drivers/char/tty_io.c -+++ linux-2.6.20/drivers/char/tty_io.c -@@ -3336,6 +3336,21 @@ int tty_ioctl(struct inode * inode, stru - case TIOCMBIC: - case TIOCMBIS: - return tty_tiocmset(tty, file, cmd, p); -+ /* +Index: linux-2.6.21/drivers/char/tty_io.c +=================================================================== +--- linux-2.6.21.orig/drivers/char/tty_io.c 2007-05-26 09:51:22.000000000 +0200 ++++ linux-2.6.21/drivers/char/tty_io.c 2007-05-26 09:52:01.000000000 +0200 +@@ -3347,6 +3347,21 @@ int tty_ioctl(struct inode * inode, stru + return tioclinux(tty, arg); + #endif + /* + * Without the real device to which /dev/console is connected, + * blogd can not work. + * blogd spawns a pty/tty pair, @@ -41,11 +42,26 @@ + return put_user(ret, (unsigned int __user *)p); + } + - } - if (tty->driver->ioctl) { - retval = (tty->driver->ioctl)(tty, file, cmd, arg); ---- linux-2.6.20.orig/include/asm-alpha/ioctls.h -+++ linux-2.6.20/include/asm-alpha/ioctls.h ++ /* + * Break handling + */ + case TIOCSBRK: /* Turn break on, unconditionally */ +Index: linux-2.6.21/fs/compat_ioctl.c +=================================================================== +--- linux-2.6.21.orig/fs/compat_ioctl.c 2007-05-26 09:51:29.000000000 +0200 ++++ linux-2.6.21/fs/compat_ioctl.c 2007-05-26 09:51:47.000000000 +0200 +@@ -2434,6 +2434,7 @@ COMPATIBLE_IOCTL(TCSETSW) + COMPATIBLE_IOCTL(TCSETSF) + COMPATIBLE_IOCTL(TIOCLINUX) + COMPATIBLE_IOCTL(TIOCSBRK) ++COMPATIBLE_IOCTL(TIOCGDEV) + COMPATIBLE_IOCTL(TIOCCBRK) + ULONG_IOCTL(TIOCMIWAIT) + COMPATIBLE_IOCTL(TIOCGICOUNT) +Index: linux-2.6.21/include/asm-alpha/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-alpha/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-alpha/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -54,8 +70,10 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 ---- linux-2.6.20.orig/include/asm-arm/ioctls.h -+++ linux-2.6.20/include/asm-arm/ioctls.h +Index: linux-2.6.21/include/asm-arm/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-arm/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-arm/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -48,6 +48,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -64,18 +82,22 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-i386/ioctls.h -+++ linux-2.6.20/include/asm-i386/ioctls.h -@@ -49,6 +49,7 @@ - #define TIOCGSID 0x5429 /* Return the session ID of FD */ +Index: linux-2.6.21/include/asm-i386/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-i386/ioctls.h 2007-05-26 09:51:34.000000000 +0200 ++++ linux-2.6.21/include/asm-i386/ioctls.h 2007-05-26 09:51:47.000000000 +0200 +@@ -53,6 +53,7 @@ + #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */ +#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */ #define FIONCLEX 0x5450 #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-ia64/ioctls.h -+++ linux-2.6.20/include/asm-ia64/ioctls.h +Index: linux-2.6.21/include/asm-ia64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-ia64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-ia64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -55,6 +55,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -84,8 +106,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-m68k/ioctls.h -+++ linux-2.6.20/include/asm-m68k/ioctls.h +Index: linux-2.6.21/include/asm-m68k/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-m68k/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-m68k/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -48,6 +48,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -94,8 +118,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-mips/ioctls.h -+++ linux-2.6.20/include/asm-mips/ioctls.h +Index: linux-2.6.21/include/asm-mips/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-mips/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-mips/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -79,6 +79,7 @@ #define TIOCGSID 0x7416 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -104,8 +130,10 @@ /* I hope the range from 0x5480 on is free ... */ #define TIOCSCTTY 0x5480 /* become controlling tty */ ---- linux-2.6.20.orig/include/asm-powerpc/ioctls.h -+++ linux-2.6.20/include/asm-powerpc/ioctls.h +Index: linux-2.6.21/include/asm-powerpc/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-powerpc/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-powerpc/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -91,6 +91,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -114,8 +142,10 @@ #define TIOCSERCONFIG 0x5453 #define TIOCSERGWILD 0x5454 ---- linux-2.6.20.orig/include/asm-s390/ioctls.h -+++ linux-2.6.20/include/asm-s390/ioctls.h +Index: linux-2.6.21/include/asm-s390/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-s390/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-s390/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -56,6 +56,7 @@ #define TIOCGSID 0x5429 /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -124,8 +154,10 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/asm-sh/ioctls.h -+++ linux-2.6.20/include/asm-sh/ioctls.h +Index: linux-2.6.21/include/asm-sh/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sh/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sh/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -80,6 +80,7 @@ #define TIOCGSID _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */ #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -134,8 +166,10 @@ #define TIOCSERCONFIG _IO('T', 83) /* 0x5453 */ #define TIOCSERGWILD _IOR('T', 84, int) /* 0x5454 */ ---- linux-2.6.20.orig/include/asm-sparc/ioctls.h -+++ linux-2.6.20/include/asm-sparc/ioctls.h +Index: linux-2.6.21/include/asm-sparc/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sparc/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sparc/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -15,6 +15,7 @@ #define TCSETS _IOW('T', 9, struct termios) #define TCSETSW _IOW('T', 10, struct termios) @@ -144,8 +178,10 @@ /* Note that all the ioctls that are not available in Linux have a * double underscore on the front to: a) avoid some programs to ---- linux-2.6.20.orig/include/asm-sparc64/ioctls.h -+++ linux-2.6.20/include/asm-sparc64/ioctls.h +Index: linux-2.6.21/include/asm-sparc64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-sparc64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-sparc64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -16,6 +16,7 @@ #define TCSETS _IOW('T', 9, struct termios) #define TCSETSW _IOW('T', 10, struct termios) @@ -154,8 +190,10 @@ /* Note that all the ioctls that are not available in Linux have a * double underscore on the front to: a) avoid some programs to ---- linux-2.6.20.orig/include/asm-x86_64/ioctls.h -+++ linux-2.6.20/include/asm-x86_64/ioctls.h +Index: linux-2.6.21/include/asm-x86_64/ioctls.h +=================================================================== +--- linux-2.6.21.orig/include/asm-x86_64/ioctls.h 2007-04-26 05:08:32.000000000 +0200 ++++ linux-2.6.21/include/asm-x86_64/ioctls.h 2007-05-26 09:51:47.000000000 +0200 @@ -52,6 +52,7 @@ #define TCSETSF2 _IOW('T',0x2D, struct termios2) #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */ @@ -164,13 +202,3 @@ #define FIONCLEX 0x5450 /* these numbers need to be adjusted. */ #define FIOCLEX 0x5451 ---- linux-2.6.20.orig/include/linux/compat_ioctl.h -+++ linux-2.6.20/include/linux/compat_ioctl.h -@@ -21,6 +21,7 @@ COMPATIBLE_IOCTL(TCSETSW) - COMPATIBLE_IOCTL(TCSETSF) - COMPATIBLE_IOCTL(TIOCLINUX) - COMPATIBLE_IOCTL(TIOCSBRK) -+COMPATIBLE_IOCTL(TIOCGDEV) - COMPATIBLE_IOCTL(TIOCCBRK) - ULONG_IOCTL(TIOCMIWAIT) - COMPATIBLE_IOCTL(TIOCGICOUNT) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tulip-quad-NIC-ifdown new/patches.fixes/tulip-quad-NIC-ifdown --- old/patches.fixes/tulip-quad-NIC-ifdown 2007-01-12 20:45:20.000000000 +0100 +++ new/patches.fixes/tulip-quad-NIC-ifdown 2007-05-26 11:06:20.000000000 +0200 @@ -11,9 +11,9 @@ drivers/net/tulip/tulip_core.c | 4 ++++ 1 files changed, 4 insertions(+) ---- linux-2.6.19.orig/drivers/net/tulip/tulip_core.c -+++ linux-2.6.19/drivers/net/tulip/tulip_core.c -@@ -1798,6 +1798,10 @@ static void __devexit tulip_remove_one ( +--- linux-2.6.21.orig/drivers/net/tulip/tulip_core.c ++++ linux-2.6.21/drivers/net/tulip/tulip_core.c +@@ -1794,6 +1794,10 @@ static void __devexit tulip_remove_one ( return; tp = netdev_priv(dev); ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 1034563 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/buildhost new/patches.rpmify/buildhost --- old/patches.rpmify/buildhost 2007-03-21 20:44:08.000000000 +0100 +++ new/patches.rpmify/buildhost 2007-05-26 11:06:26.000000000 +0200 @@ -9,12 +9,12 @@ scripts/mkcompile_h | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) ---- linux-2.6.20.orig/scripts/mkcompile_h -+++ linux-2.6.20/scripts/mkcompile_h -@@ -47,16 +47,9 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\} +--- linux-2.6.21.orig/scripts/mkcompile_h ++++ linux-2.6.21/scripts/mkcompile_h +@@ -60,16 +60,9 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\} echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\" - echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\" + echo \#define LINUX_COMPILE_TIME \"`date +%T`\" - echo \#define LINUX_COMPILE_BY \"`whoami`\" - echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\" - @@ -29,5 +29,5 @@ + echo \#define LINUX_COMPILE_HOST \"buildhost\" + echo \#define LINUX_COMPILE_DOMAIN \"suse.de\" - echo \#define LINUX_COMPILER \"`LC_ALL=C LANG=C $CC -v 2>&1 | tail -n 1`\" + echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\" ) > .tmpcompile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/build-timestamp new/patches.rpmify/build-timestamp --- old/patches.rpmify/build-timestamp 2005-10-08 06:19:19.000000000 +0200 +++ new/patches.rpmify/build-timestamp 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Subject: I have no idea, why is this not upstream? -From: someone@suse.de - - -mkcompile_h | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletion(-) - -Index: linux-2.6.13/scripts/mkcompile_h -=================================================================== ---- linux-2.6.13.orig/scripts/mkcompile_h 2005-10-07 21:01:22.000000000 -0700 -+++ linux-2.6.13/scripts/mkcompile_h 2005-10-07 21:03:10.000000000 -0700 -@@ -30,7 +30,12 @@ - CONFIG_FLAGS="" - if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi - if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi --UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS `LC_ALL=C LANG=C date`" -+if [ -n "$BUILD_TIMESTAMP" ]; then -+ TIMESTAMP="`LC_ALL=C LANG=C date -d "$BUILD_TIMESTAMP"`" -+else -+ TIMESTAMP="`LC_ALL=C LANG=C date`" -+fi -+UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP" - - # Truncate to maximum length - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rpmify/rpm-kernel-config new/patches.rpmify/rpm-kernel-config --- old/patches.rpmify/rpm-kernel-config 2007-01-09 01:56:04.000000000 +0100 +++ new/patches.rpmify/rpm-kernel-config 2007-05-26 11:06:26.000000000 +0200 @@ -10,11 +10,11 @@ init/Kconfig | 4 ++++ 1 files changed, 4 insertions(+) ---- linux-2.6.19.orig/init/Kconfig -+++ linux-2.6.19/init/Kconfig -@@ -91,6 +91,10 @@ config LOCALVERSION_AUTO - Note: This requires Perl, and a git repository, but not necessarily - the git or cogito tools to be installed. +--- linux-2.6.21.orig/init/Kconfig ++++ linux-2.6.21/init/Kconfig +@@ -95,6 +95,10 @@ config LOCALVERSION_AUTO + + which is done within the script "scripts/setlocalversion".) +config SUSE_KERNEL + bool ++++++ patches.suse.tar.bz2 ++++++ ++++ 4695 lines of diff (skipped) ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/add-console-use-vt new/patches.xen/add-console-use-vt --- old/patches.xen/add-console-use-vt 2007-03-21 20:44:10.000000000 +0100 +++ new/patches.xen/add-console-use-vt 2007-05-26 11:06:27.000000000 +0200 @@ -9,8 +9,8 @@ include/linux/console.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) ---- linux-2.6.20.orig/drivers/char/tty_io.c -+++ linux-2.6.20/drivers/char/tty_io.c +--- linux-2.6.21.orig/drivers/char/tty_io.c ++++ linux-2.6.21/drivers/char/tty_io.c @@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers); /* linked list DEFINE_MUTEX(tty_mutex); EXPORT_SYMBOL(tty_mutex); @@ -20,7 +20,7 @@ #ifdef CONFIG_UNIX98_PTYS extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */ extern int pty_limit; /* Config limit on Unix98 ptys */ -@@ -2532,7 +2534,7 @@ retry_open: +@@ -2574,7 +2576,7 @@ retry_open: goto got_driver; } #ifdef CONFIG_VT @@ -29,7 +29,7 @@ extern struct tty_driver *console_driver; driver = console_driver; index = fg_console; -@@ -3974,6 +3976,8 @@ static int __init tty_init(void) +@@ -4041,6 +4043,8 @@ static int __init tty_init(void) #endif #ifdef CONFIG_VT @@ -38,7 +38,7 @@ cdev_init(&vc0_cdev, &console_fops); if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) -@@ -3981,6 +3985,7 @@ static int __init tty_init(void) +@@ -4048,6 +4052,7 @@ static int __init tty_init(void) device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0"); vty_init(); @@ -46,8 +46,8 @@ #endif return 0; } ---- linux-2.6.20.orig/include/linux/console.h -+++ linux-2.6.20/include/linux/console.h +--- linux-2.6.21.orig/include/linux/console.h ++++ linux-2.6.21/include/linux/console.h @@ -63,6 +63,7 @@ extern const struct consw dummy_con; /* extern const struct consw vga_con; /* VGA text console */ extern const struct consw newport_con; /* SGI Newport console */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch new/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch --- old/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch 2007-04-30 10:41:28.000000000 +0200 +++ new/patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -Subject: allow handling of x86-64 crash dumps on i386 -From: http://xenbits.xensource.com/xen-unstable.hg (tip 14960) -Acked-by: jbeulich@novell.com - -From: Ian Campbell <ian.campbell@xensource.com> - -The specific case I am encountering is kdump under Xen with a 64 bit -hypervisor and 32 bit kernel/userspace. The dump created is 64 bit due to -the hypervisor but the dump kernel is 32 bit for maximum compatibility. - -It's possibly less likely to be useful in a purely native scenario but I -see no reason to disallow it. - -Signed-off-by: Ian Campbell <ian.campbell@xensource.com> -Acked-by: Vivek Goyal <vgoyal@in.ibm.com> -Cc: Horms <horms@verge.net.au> -Cc: Magnus Damm <magnus.damm@gmail.com> -Cc: "Eric W. Biederman" <ebiederm@xmission.com> -Cc: Andi Kleen <ak@suse.de> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> - -Index: head-2007-04-27/fs/proc/vmcore.c -=================================================================== ---- head-2007-04-27.orig/fs/proc/vmcore.c 2007-04-26 05:08:32.000000000 +0200 -+++ head-2007-04-27/fs/proc/vmcore.c 2007-04-27 12:36:55.000000000 +0200 -@@ -514,7 +514,7 @@ static int __init parse_crash_elf64_head - /* Do some basic Verification. */ - if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 || - (ehdr.e_type != ET_CORE) || -- !elf_check_arch(&ehdr) || -+ !vmcore_elf_check_arch(&ehdr) || - ehdr.e_ident[EI_CLASS] != ELFCLASS64 || - ehdr.e_ident[EI_VERSION] != EV_CURRENT || - ehdr.e_version != EV_CURRENT || -Index: head-2007-04-27/include/asm-i386/kexec.h -=================================================================== ---- head-2007-04-27.orig/include/asm-i386/kexec.h 2007-04-27 12:34:30.000000000 +0200 -+++ head-2007-04-27/include/asm-i386/kexec.h 2007-04-27 12:36:55.000000000 +0200 -@@ -47,6 +47,9 @@ - /* The native architecture */ - #define KEXEC_ARCH KEXEC_ARCH_386 - -+/* We can also handle crash dumps from 64 bit kernel. */ -+#define vmcore_elf_check_arch_cross(x) ((x)->e_machine == EM_X86_64) -+ - #define MAX_NOTE_BYTES 1024 - - /* CPU does not save ss and esp on stack if execution is already -Index: head-2007-04-27/include/linux/crash_dump.h -=================================================================== ---- head-2007-04-27.orig/include/linux/crash_dump.h 2007-04-26 05:08:32.000000000 +0200 -+++ head-2007-04-27/include/linux/crash_dump.h 2007-04-27 12:36:55.000000000 +0200 -@@ -14,5 +14,13 @@ extern ssize_t copy_oldmem_page(unsigned - extern const struct file_operations proc_vmcore_operations; - extern struct proc_dir_entry *proc_vmcore; - -+/* Architecture code defines this if there are other possible ELF -+ * machine types, e.g. on bi-arch capable hardware. */ -+#ifndef vmcore_elf_check_arch_cross -+#define vmcore_elf_check_arch_cross(x) 0 -+#endif -+ -+#define vmcore_elf_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x)) -+ - #endif /* CONFIG_CRASH_DUMP */ - #endif /* LINUX_CRASHDUMP_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/net-csum.patch new/patches.xen/net-csum.patch --- old/patches.xen/net-csum.patch 2007-03-23 09:16:58.000000000 +0100 +++ new/patches.xen/net-csum.patch 2007-05-26 11:06:27.000000000 +0200 @@ -4,11 +4,15 @@ This is only a guess, based on suggestions from Keir Fraser. -Index: head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_tcp.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_tcp.c 2007-03-19 14:38:33.000000000 +0100 -@@ -134,6 +134,9 @@ tcp_manip_pkt(struct sk_buff **pskb, +--- + net/ipv4/netfilter/nf_nat_proto_tcp.c | 3 +++ + net/ipv4/netfilter/nf_nat_proto_udp.c | 4 ++++ + net/ipv4/xfrm4_output.c | 4 ++++ + 3 files changed, 11 insertions(+) + +--- a/net/ipv4/netfilter/nf_nat_proto_tcp.c 2007-05-02 14:56:11.000000000 -0400 ++++ b/net/ipv4/netfilter/nf_nat_proto_tcp.c 2007-05-24 18:43:41.000000000 -0400 +@@ -132,6 +132,9 @@ tcp_manip_pkt(struct sk_buff **pskb, if (hdrsize < sizeof(*hdr)) return 1; @@ -18,25 +22,22 @@ nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1); nf_proto_csum_replace2(&hdr->check, *pskb, oldport, newport, 0); return 1; -Index: head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_udp.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/netfilter/ip_nat_proto_udp.c 2007-03-19 14:38:33.000000000 +0100 -@@ -119,6 +119,9 @@ udp_manip_pkt(struct sk_buff **pskb, +--- a/net/ipv4/netfilter/nf_nat_proto_udp.c 2007-05-02 14:56:11.000000000 -0400 ++++ b/net/ipv4/netfilter/nf_nat_proto_udp.c 2007-05-24 18:44:15.000000000 -0400 +@@ -116,6 +116,10 @@ udp_manip_pkt(struct sk_buff **pskb, + newport = tuple->dst.u.udp.port; portptr = &hdr->dest; } - ++ + if (skb_checksum_setup(*pskb)) + return 0; + if (hdr->check || (*pskb)->ip_summed == CHECKSUM_PARTIAL) { nf_proto_csum_replace4(&hdr->check, *pskb, oldip, newip, 1); - nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, 0); -Index: head-2007-03-19/net/ipv4/xfrm4_output.c -=================================================================== ---- head-2007-03-19.orig/net/ipv4/xfrm4_output.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/net/ipv4/xfrm4_output.c 2007-03-19 14:40:14.000000000 +0100 -@@ -48,6 +48,10 @@ static int xfrm4_output_one(struct sk_bu + nf_proto_csum_replace2(&hdr->check, *pskb, *portptr, newport, +--- a/net/ipv4/xfrm4_output.c 2007-05-24 18:41:08.000000000 -0400 ++++ b/net/ipv4/xfrm4_output.c 2007-05-24 18:43:41.000000000 -0400 +@@ -47,6 +47,10 @@ static int xfrm4_output_one(struct sk_bu struct xfrm_state *x = dst->xfrm; int err; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/pmd-shared.patch new/patches.xen/pmd-shared.patch --- old/patches.xen/pmd-shared.patch 2007-03-23 09:16:58.000000000 +0100 +++ new/patches.xen/pmd-shared.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -Subject: xen3 i386 shared kernel PMD -From: http://xenbits.xensource.com/xen-unstable.hg (tip 14422) -Acked-by: jbeulich@novell.com - -Index: head-2007-03-19/arch/i386/mm/pageattr.c -=================================================================== ---- head-2007-03-19.orig/arch/i386/mm/pageattr.c 2007-03-19 14:37:24.000000000 +0100 -+++ head-2007-03-19/arch/i386/mm/pageattr.c 2007-03-19 14:40:23.000000000 +0100 -@@ -91,7 +91,7 @@ static void set_pmd_pte(pte_t *kpte, uns - unsigned long flags; - - set_pte_atomic(kpte, pte); /* change init_mm */ -- if (PTRS_PER_PMD > 1) -+ if (HAVE_SHARED_KERNEL_PMD) - return; - - spin_lock_irqsave(&pgd_lock, flags); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/softlockup-no-idle-hz.patch new/patches.xen/softlockup-no-idle-hz.patch --- old/patches.xen/softlockup-no-idle-hz.patch 2007-04-30 10:41:28.000000000 +0200 +++ new/patches.xen/softlockup-no-idle-hz.patch 2007-05-26 11:06:27.000000000 +0200 @@ -7,13 +7,13 @@ --- head-2007-04-27.orig/include/linux/sched.h 2007-04-27 12:34:34.000000000 +0200 +++ head-2007-04-27/include/linux/sched.h 2007-04-27 12:36:44.000000000 +0200 @@ -223,10 +223,15 @@ extern void update_process_times(int use - extern void scheduler_tick(void); #ifdef CONFIG_DETECT_SOFTLOCKUP +extern unsigned long softlockup_get_next_event(void); extern void softlockup_tick(void); extern void spawn_softlockup_task(void); extern void touch_softlockup_watchdog(void); + extern void touch_all_softlockup_watchdogs(void); #else +static inline unsigned long softlockup_get_next_event(void) +{ ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-05-25 18:14:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-05-27 18:39:59.000000000 +0200 @@ -20,6 +20,8 @@ # latest standard kernel patches # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... + patches.kernel.org/patch-2.6.22-rc2 + patches.kernel.org/patch-2.6.22-rc2-git7 ######################################################## # @@ -33,7 +35,6 @@ patches.rpmify/rpm-kernel-config patches.rpmify/buildhost patches.rpmify/cloneconfig.diff - patches.rpmify/build-timestamp # every patch below is optional patches.suse/error-implicit-function-declaration.patch @@ -43,10 +44,6 @@ # workarounds - # #302001 - patches.suse/add-IV-generation-method-null-to-dm-crypt - patches.fixes/maybe_unused.patch - ######################################################## # # patches for certain architectures @@ -68,37 +65,24 @@ # numa mempolicy # suse ppc - patches.arch/ppc-generic-check_legacy_ioport.patch - patches.arch/ppc-pci-hostbridge-window.patch - patches.arch/ppc-of_device-modalias.patch patches.arch/ppc-vio-modalias.patch - patches.arch/ppc-macio-modalias.patch - patches.arch/ppc-pegasos-via-ide-irq-quirk.patch patches.arch/ppc-efika-modalias.patch patches.arch/ppc-efika-bestcomm-ethernet.patch patches.arch/ppc-efika-mpc52xx-ac97.patch patches.arch/ppc-efika-of_device-generic-uevent.patch patches.arch/ppc-efika-psc-console-autodetection.patch - patches.arch/ppc-ps3-generic-fbdev-updates.patch - patches.arch/ppc-ps3-linus.patch patches.arch/ppc-ps3-device-init.patch patches.arch/ppc-ps3-bt-event-filter.patch patches.arch/ppc-ps3-kexec-fixes.patch patches.arch/ppc-ps3-system-bus-rework.patch - patches.arch/ppc-ps3-allow-duplicate-lmb_reserve.diff - patches.arch/ppc-ps3-automatically-lmb_reserve-initrd.diff - patches.arch/ppc-ps3-ps3fb.patch patches.arch/ppc-ps3-hack-fbcon-shutdown.patch - patches.arch/ppc-spufs.patch - patches.arch/ppc-ps3-ps3-fix-slowdown-bug.patch patches.arch/ppc-ps3-cell-usb-workaround-ehci-iso.diff patches.arch/ppc-ps3-sys-manager-fix-reboot.patch patches.arch/ppc-ps3-vuart-as-module.patch patches.arch/ppc-ps3-gelic.patch patches.arch/ppc-ps3-gelic-device_symlink.patch patches.arch/ppc-ps3-gelic-module-link.patch - patches.arch/ppc-ps3-gelic_2621.patch patches.arch/spufs-clear-class-0-interrupt.patch patches.arch/spufs-wrap-master-run-bit.patch patches.arch/ppc-ps3-dma-mem-hack.patch @@ -116,6 +100,8 @@ patches.suse/suse-ppc-pmac_zilog-i8250-coexistance.patch patches.suse/suse-ppc32-mol.patch patches.suse/suse-ppc32-mol-kbuild.patch + patches.suse/suse-ppc32-mol-sheep + patches.suse/suse-ppc32-mol-find-devices # suse ppc64 patches.drivers/ppc64-adb @@ -140,7 +126,7 @@ # misc small fixes # ######################################################## - patches.suse/ams-silent-failure.patch + patches.fixes/s2io-longlong ######################################################## # @@ -148,13 +134,13 @@ # ######################################################## +trenn patches.suse/acpi_dsdt_ssdt_initrd_initramfs.patch ++trenn patches.fixes/acpi_execute_notify_threaded.patch # Specific support for vendor-specific features # adds sony and panasonic acpi modules: patches.suse/acpi-hotkeys-extra.diff patches.arch/acpi_asus_strict_model_check.patch patches.suse/acpi_sony_init_fixups.patch - patches.arch/acpi_ibm_notify.patch patches.arch/acpi_processor_exit_acpi_off @@ -177,8 +163,6 @@ # NFS ######################################################## - patches.fixes/nfs-readdir-timestamp - ######################################################## # lockd + statd # @@ -253,10 +237,8 @@ # Storage ######################################################## - patches.drivers/libata-add-waits-for-govault - patches.drivers/libata-hardreset-on-SERR_INTERNAL ++tejun patches.drivers/libata-add-waits-for-govault patches.drivers/libata-ata_piix-vmw-ign-DMA-err - patches.drivers/cciss-add-SG_IO patches.fixes/mptbase-vmware-fix # Remaining SCSI patches (garloff) @@ -277,7 +259,6 @@ ######################################################## # PCI and PCI hotplug ######################################################## - patches.drivers/ati-rs400_200-480-disable-msi ######################################################## # sysfs / driver core @@ -361,11 +342,10 @@ ########################################################## # AppArmor ########################################################## - patches.apparmor/proc_setattr.diff - patches.apparmor/proc_sys_setattr.diff patches.apparmor/security-create.diff patches.apparmor/remove_suid.diff patches.apparmor/vfs-notify_change.diff + patches.apparmor/remove_suid_new_case_in_2.6.22.diff patches.apparmor/security-setattr.diff patches.apparmor/vfs-mkdir.diff patches.apparmor/security-mkdir.diff @@ -441,7 +421,6 @@ patches.fixes/grab-swap-token-oops patches.arch/disable-apic-error - patches.fixes/dm_check_device_area.diff patches.suse/smtnice-disable @@ -481,63 +460,62 @@ # re-basing to a newer xen tree. # split out patches - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch - patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch - patches.xen/blktap-aio-16_03_06.patch - patches.xen/fix-ide-cd-pio-mode.patch - patches.xen/i386-mach-io-check-nmi.patch - patches.xen/net-csum.patch - patches.xen/pmd-shared.patch - patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch - patches.xen/xenoprof-generic.patch - patches.xen/softlockup-no-idle-hz.patch - patches.xen/allow-i386-crash-kernels-to-handle-x86_64-dumps.patch - - # bulk stuff, new files for xen - patches.xen/xen3-auto-xen-arch.diff - patches.xen/xen3-auto-xen-drivers.diff - patches.xen/xen3-auto-include-xen-interface.diff - - # kconfig bits for xen - patches.xen/xen3-auto-xen-kconfig.diff - - # common code changes - patches.xen/xen3-auto-common.diff - patches.xen/xen3-auto-arch-i386.diff -+empty patches.xen/xen3-auto-arch-um.diff - patches.xen/xen3-auto-arch-x86_64.diff - - # newer changeset backports - - # changes outside arch/{i386,x86_64}/xen - patches.xen/xen3-fixup-common - patches.xen/xen3-fixup-arch-i386 -+empty patches.xen/xen3-fixup-arch-um - patches.xen/xen3-fixup-arch-x86_64 - - # ports of other patches - patches.xen/xen3-patch-2.6.18 - patches.xen/xen3-patch-2.6.19 - patches.xen/xen3-patch-2.6.20 - patches.xen/xen3-patch-2.6.21 - patches.xen/xen3-sysfs-crash-debugging.patch -+andrea patches.xen/xen3-silent-stack-overflow - - # bugfixes and enhancements - patches.xen/xen-balloon-min - patches.xen/xen-modular-blktap - patches.xen/xen-x86-panic-no-reboot - patches.xen/xen-i386-panic-on-oops - patches.xen/xen-x86-kconfig-no-cpu_freq - patches.xen/xen-configurable-console - patches.xen/xen-x86_64-init-cleanup - patches.xen/xen-balloon-max-target - patches.xen/xen-x86-dcr-fallback - patches.xen/xen-x86-consistent-nmi - patches.xen/xen-x86-no-lapic - patches.xen/xen-no-video-select - patches.xen/xen-blkback-bimodal-suse - patches.xen/xen-console-default - patches.xen/xen-x86-panic-smp - patches.xen/xen-split-pt-lock - patches.xen/xen-blkif-protocol-fallback-hack ++xen patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-i386.patch ++xen patches.xen/linux-2.6.19-rc1-kexec-move_segment_code-x86_64.patch ++xen patches.xen/blktap-aio-16_03_06.patch ++xen patches.xen/fix-ide-cd-pio-mode.patch ++xen patches.xen/i386-mach-io-check-nmi.patch ++xen patches.xen/net-csum.patch ++xen patches.xen/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch ++xen patches.xen/xenoprof-generic.patch ++xen patches.xen/softlockup-no-idle-hz.patch ++xen ++xen # bulk stuff, new files for xen ++xen patches.xen/xen3-auto-xen-arch.diff ++xen patches.xen/xen3-auto-xen-drivers.diff ++xen patches.xen/xen3-auto-include-xen-interface.diff ++xen ++xen # kconfig bits for xen ++xen patches.xen/xen3-auto-xen-kconfig.diff ++xen ++xen # common code changes ++xen patches.xen/xen3-auto-common.diff ++xen patches.xen/xen3-auto-arch-i386.diff ++xen+empty patches.xen/xen3-auto-arch-um.diff ++xen patches.xen/xen3-auto-arch-x86_64.diff ++xen ++xen # newer changeset backports ++xen ++xen # changes outside arch/{i386,x86_64}/xen ++xen patches.xen/xen3-fixup-common ++xen patches.xen/xen3-fixup-arch-i386 ++xen+empty patches.xen/xen3-fixup-arch-um ++xen patches.xen/xen3-fixup-arch-x86_64 ++xen ++xen # ports of other patches ++xen patches.xen/xen3-patch-2.6.18 ++xen patches.xen/xen3-patch-2.6.19 ++xen patches.xen/xen3-patch-2.6.20 ++xen patches.xen/xen3-patch-2.6.21 ++xen patches.xen/xen3-sysfs-crash-debugging.patch ++xen+andrea patches.xen/xen3-silent-stack-overflow ++xen ++xen ++xen # bugfixes and enhancements ++xen patches.xen/xen-balloon-min ++xen patches.xen/xen-modular-blktap ++xen patches.xen/xen-x86-panic-no-reboot ++xen patches.xen/xen-i386-panic-on-oops ++xen patches.xen/xen-x86-kconfig-no-cpu_freq ++xen patches.xen/xen-configurable-console ++xen patches.xen/xen-x86_64-init-cleanup ++xen patches.xen/xen-balloon-max-target ++xen patches.xen/xen-x86-dcr-fallback ++xen patches.xen/xen-x86-consistent-nmi ++xen patches.xen/xen-x86-no-lapic ++xen patches.xen/xen-no-video-select ++xen patches.xen/xen-blkback-bimodal-suse ++xen patches.xen/xen-console-default ++xen patches.xen/xen-x86-panic-smp ++xen patches.xen/xen-split-pt-lock ++xen patches.xen/xen-blkif-protocol-fallback-hack ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org