Hello community,
here is the log from the commit of package kernel-source
checked in at Wed Aug 30 23:43:24 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-08-28 22:45:48.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-08-30 14:50:49.000000000 +0200
@@ -1,0 +2,102 @@
+Wed Aug 30 14:39:14 CEST 2006 - olh@suse.de
+
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+
+-------------------------------------------------------------------
+Wed Aug 30 14:34:22 CEST 2006 - olh@suse.de
+
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+
+-------------------------------------------------------------------
+Wed Aug 30 03:21:52 CEST 2006 - tonyj@suse.de
+
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+
+-------------------------------------------------------------------
+Wed Aug 30 02:31:45 CEST 2006 - gregkh@suse.de
+
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 23:17:59 CEST 2006 - gregkh@suse.de
+
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 21:01:47 CEST 2006 - olh@suse.de
+
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+
+-------------------------------------------------------------------
+Tue Aug 29 17:55:51 CEST 2006 - jeffm@suse.de
+
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+
+-------------------------------------------------------------------
+Tue Aug 29 14:07:42 CEST 2006 - axboe@suse.de
+
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 10:09:38 CEST 2006 - gregkh@suse.de
+
+- patches.arch/s390-raw-device: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 09:53:28 CEST 2006 - okir@suse.de
+
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 08:33:31 CEST 2006 - ak@suse.de
+
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+
+-------------------------------------------------------------------
+Tue Aug 29 08:08:32 CEST 2006 - gregkh@suse.de
+
+- patches.suse/acpi-oldboot: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 05:07:50 CEST 2006 - gregkh@suse.de
+
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+
+-------------------------------------------------------------------
+Tue Aug 29 03:27:39 CEST 2006 - gregkh@suse.de
+
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+
+-------------------------------------------------------------------
+Tue Aug 29 01:10:37 CEST 2006 - jeffm@suse.de
+
+- Took ownership of mason's patches without patch-mainline tags.
+
+-------------------------------------------------------------------
+Tue Aug 29 01:05:34 CEST 2006 - gregkh@suse.de
+
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
New:
----
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:33.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:33.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -119,7 +119,7 @@
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -463,6 +463,60 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -17,7 +17,7 @@
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
Version: 2.6.18_rc5
-Release: 1
+Release: 2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%install
@@ -40,6 +40,60 @@
/etc/dummy
%changelog -n kernel-dummy
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -120,7 +120,7 @@
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -464,6 +464,60 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
kernel-kdump.spec: same change
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -20,7 +20,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -134,7 +134,7 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -478,6 +478,60 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -117,7 +117,7 @@
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -461,6 +461,60 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -25,7 +25,7 @@
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -92,7 +92,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -274,6 +274,60 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -49,7 +49,7 @@
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Requires: linux
Requires: kernel-source = 2.6.18_rc5-%release
Source11: arch-symbols
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%install
@@ -127,6 +127,60 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.2N4nJf/_old 2006-08-30 23:38:34.000000000 +0200
+++ /var/tmp/diff_new_pack.2N4nJf/_new 2006-08-30 23:38:34.000000000 +0200
@@ -21,7 +21,7 @@
BuildRequires: python
%endif
Version: 2.6.18_rc5
-Release: 1
+Release: 2
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -125,7 +125,7 @@
-Source Timestamp: 2006/08/28 11:47:00 UTC
+Source Timestamp: 2006/08/30 12:40:00 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.17.tar.bz2 ]; then
@@ -469,6 +469,60 @@
%files -f kernel.files
%changelog -n kernel-um
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.suse/floppy-printk.patch
+ dont print anything if there is no floppy to avoid hwinfo confusion
+* Wed Aug 30 2006 - olh@suse.de
+- add patches.arch/ppc-update_gtod-race.patch
+ fix timebase overflow on ppc32 (202146)
+* Wed Aug 30 2006 - tonyj@suse.de
+- patches.suse/apparmor-mmapexec.patch: add Patch-mainline tags
+- patches.suse/apparmor-secureexec.patch: add Patch-mainline tags
+* Wed Aug 30 2006 - gregkh@suse.de
+- Disable CONFIG_SMB_FS CIFS is now the way to go. The samba team is working
+ on the migration tools for the upgrade issues.
+- patches.drivers/smbfs-sendqueue-backoff: Delete.
+- patches.drivers/smbfs-request-counting: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/rcu-remote: Delete.
+- patches.suse/rcu-scale: Delete.
+* Tue Aug 29 2006 - olh@suse.de
+- drop patches.arch/ppc-kdump-disable-eeh-and-numa.patch
+ drop patches.arch/ppc-kdump-shutdown-interrupts.patch
+ merged in mainline
+ drop patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
+ sysrq is broken on pmac_zilog
+* Tue Aug 29 2006 - jeffm@suse.de
+- Merged patches.suse/initramfs-before-acpi.patch into
+ patches.suse/acpi_dsdt_initrd_initramfs
+* Tue Aug 29 2006 - axboe@suse.de
+- patches.drivers/sis5513-support-sis-965l: Delete.
+- patches.fixes/libata-increase-timeout-for-resume: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/s390-raw-device: Delete.
+* Tue Aug 29 2006 - okir@suse.de
+- patches.fixes/ipv6-init-fail-cleanup: Delete.
+* Tue Aug 29 2006 - ak@suse.de
+- patches.arch/x86_64-nmi-watchdog-timeout: Delete.
+- patches.suse/bh-cache-option: Delete.
+- patches.arch/i386-default-max-mp-busses: Fix comments
+- patches.arch/disable-apic-error: Fix comments
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.suse/acpi-oldboot: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- Removed unused patches from the tree
+- patches.fixes/kdb-missing-export.diff: Delete.
+- patches.fixes/nfsd-setuser-fix: Delete.
+- patches.rpmify/suse-extmod-legacy: Delete.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.fixes/nfsv4-setclientid: Delete.
+- Update headers on patches.fixes/samsung-unusual-floppy: USB floppy drive
+ SAMSUNG SFD-321U/EP detected 8 times (117643).
+* Tue Aug 29 2006 - jeffm@suse.de
+- Took ownership of mason's patches without patch-mainline tags.
+* Tue Aug 29 2006 - gregkh@suse.de
+- patches.arch/ia64-export-node-to-cpu-mask.patch: Delete.
+- patches.fixes/tulip-down-race: Delete.
* Mon Aug 28 2006 - olh@suse.de
- add patches.suse/mv643xx_eth.hwinfo.patch
load the driver via the PCI bridge id until hwinfo is fixed (199112)
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-08-28 22:45:41.000000000 +0200
+++ kernel-source/build-source-timestamp 2006-08-30 14:50:46.000000000 +0200
@@ -1 +1 @@
-2006/08/28 11:47:00 UTC
+2006/08/30 12:40:00 UTC
++++++ config.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default
--- old/config/alpha/default 2006-08-28 09:59:05.000000000 +0200
+++ new/config/alpha/default 2006-08-30 14:52:41.000000000 +0200
@@ -3050,9 +3050,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp
--- old/config/i386/bigsmp 2006-08-28 20:03:28.000000000 +0200
+++ new/config/i386/bigsmp 2006-08-30 14:52:41.000000000 +0200
@@ -3389,9 +3389,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2006-08-28 20:03:28.000000000 +0200
+++ new/config/i386/debug 2006-08-30 14:52:41.000000000 +0200
@@ -3383,9 +3383,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default
--- old/config/i386/default 2006-08-28 20:03:28.000000000 +0200
+++ new/config/i386/default 2006-08-30 14:52:41.000000000 +0200
@@ -3382,9 +3382,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/kdump new/config/i386/kdump
--- old/config/i386/kdump 2006-08-28 20:03:29.000000000 +0200
+++ new/config/i386/kdump 2006-08-30 14:52:41.000000000 +0200
@@ -3414,9 +3414,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um
--- old/config/i386/um 2006-08-28 20:03:29.000000000 +0200
+++ new/config/i386/um 2006-08-30 14:52:41.000000000 +0200
@@ -917,9 +917,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2006-08-28 20:03:29.000000000 +0200
+++ new/config/i386/xen 2006-08-30 14:52:41.000000000 +0200
@@ -3098,9 +3098,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae
--- old/config/i386/xenpae 2006-08-28 20:03:29.000000000 +0200
+++ new/config/i386/xenpae 2006-08-30 14:52:41.000000000 +0200
@@ -3100,9 +3100,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2006-08-28 20:03:29.000000000 +0200
+++ new/config/ia64/debug 2006-08-30 14:52:41.000000000 +0200
@@ -2832,9 +2832,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2006-08-28 20:03:29.000000000 +0200
+++ new/config/ia64/default 2006-08-30 14:52:41.000000000 +0200
@@ -2831,9 +2831,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default
--- old/config/powerpc/default 2006-08-28 20:03:29.000000000 +0200
+++ new/config/powerpc/default 2006-08-30 14:52:41.000000000 +0200
@@ -2186,7 +2186,6 @@
CONFIG_JBD_DEBUG=y
CONFIG_FS_MBCACHE=y
CONFIG_REISERFS_FS=y
-# CONFIG_REISERFS_CC_REDUCE_OPTIMZE is not set
# CONFIG_REISERFS_CHECK is not set
CONFIG_REISERFS_PROC_INFO=y
CONFIG_REISERFS_FS_XATTR=y
@@ -2294,9 +2293,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/iseries64 new/config/powerpc/iseries64
--- old/config/powerpc/iseries64 2006-08-28 20:03:29.000000000 +0200
+++ new/config/powerpc/iseries64 2006-08-30 14:52:41.000000000 +0200
@@ -1185,8 +1185,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump
--- old/config/powerpc/kdump 2006-08-28 20:03:29.000000000 +0200
+++ new/config/powerpc/kdump 2006-08-30 14:52:41.000000000 +0200
@@ -168,7 +168,9 @@
CONFIG_CRASH_DUMP=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_PPC_SPLPAR=y
+CONFIG_EEH=y
CONFIG_LPARCFG=y
+# CONFIG_NUMA is not set
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
@@ -1734,8 +1736,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64
--- old/config/powerpc/ppc64 2006-08-28 20:03:29.000000000 +0200
+++ new/config/powerpc/ppc64 2006-08-30 14:52:41.000000000 +0200
@@ -2052,8 +2052,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default
--- old/config/s390/default 2006-08-28 20:03:29.000000000 +0200
+++ new/config/s390/default 2006-08-30 14:52:41.000000000 +0200
@@ -613,8 +613,6 @@
#
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=2048
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=4096
CONFIG_HANGCHECK_TIMER=m
#
@@ -857,9 +855,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2006-08-28 20:03:29.000000000 +0200
+++ new/config/s390/s390 2006-08-30 14:52:41.000000000 +0200
@@ -608,8 +608,6 @@
#
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=2048
-CONFIG_RAW_DRIVER=m
-CONFIG_MAX_RAW_DEVS=4096
CONFIG_HANGCHECK_TIMER=m
#
@@ -852,9 +850,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2006-08-28 20:03:29.000000000 +0200
+++ new/config/x86_64/debug 2006-08-30 14:52:41.000000000 +0200
@@ -3005,9 +3005,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2006-08-28 20:03:29.000000000 +0200
+++ new/config/x86_64/default 2006-08-30 14:52:41.000000000 +0200
@@ -3005,9 +3005,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/kdump new/config/x86_64/kdump
--- old/config/x86_64/kdump 2006-08-28 20:03:29.000000000 +0200
+++ new/config/x86_64/kdump 2006-08-30 14:52:41.000000000 +0200
@@ -3019,9 +3019,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/um new/config/x86_64/um
--- old/config/x86_64/um 2006-08-28 20:03:29.000000000 +0200
+++ new/config/x86_64/um 2006-08-30 14:52:41.000000000 +0200
@@ -879,9 +879,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2006-08-28 20:03:30.000000000 +0200
+++ new/config/x86_64/xen 2006-08-30 14:52:41.000000000 +0200
@@ -2932,9 +2932,7 @@
CONFIG_SUNRPC_GSS=m
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp850"
+# CONFIG_SMB_FS is not set
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
CONFIG_CIFS_STATS2=y
++++++ kabi.tar.bz2 ++++++
++++ 8050 lines of diff (skipped)
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/disable-apic-error new/patches.arch/disable-apic-error
--- old/patches.arch/disable-apic-error 2006-03-23 23:34:27.000000000 +0100
+++ new/patches.arch/disable-apic-error 2006-08-29 18:25:49.000000000 +0200
@@ -1,10 +1,15 @@
From: ak@suse.de
Subject: Disable APIC error printing
References: 156576
+Patch-mainline: not planned
ATI chipsets currently do this all the time. It's probably
mostly harmless
+We keep it enabled in mainline to make sure the (hardware?) bug
+is tracked down, but don't bother in the distribution kernels
+with it.
+
Index: linux-2.6.16/arch/i386/kernel/apic.c
===================================================================
--- linux-2.6.16.orig/arch/i386/kernel/apic.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i386-default-max-mp-busses new/patches.arch/i386-default-max-mp-busses
--- old/patches.arch/i386-default-max-mp-busses 2006-01-23 10:35:47.000000000 +0100
+++ new/patches.arch/i386-default-max-mp-busses 2006-08-29 18:25:50.000000000 +0200
@@ -1,6 +1,7 @@
From: ak@suse.de
Subject: Increase MAX_MP_BUSSES in default kernel to match generic
Suse-bugzilla: 57179
+Patch-mainline: Should be in 2.6.19
Index: linux-2.6.15/include/asm-i386/mach-default/mach_mpspec.h
===================================================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ia64-export-node-to-cpu-mask.patch new/patches.arch/ia64-export-node-to-cpu-mask.patch
--- old/patches.arch/ia64-export-node-to-cpu-mask.patch 2006-06-15 08:04:10.000000000 +0200
+++ new/patches.arch/ia64-export-node-to-cpu-mask.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-From: Greg Banks
-Subject: export node_to_cpu_mask to allow SGI access to it.
-Patch-mainline: never
-References: 182109
-
-Why don't people ever submit their external modules to mainline so we
-don't have to worry about little things like this...
-
-Signed-off-by: Greg Kroah-Hartman
-
----
- arch/ia64/kernel/numa.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.16.orig/arch/ia64/kernel/numa.c
-+++ linux-2.6.16/arch/ia64/kernel/numa.c
-@@ -29,6 +29,7 @@ u8 cpu_to_node_map[NR_CPUS] __cacheline_
- EXPORT_SYMBOL(cpu_to_node_map);
-
- cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
-+EXPORT_SYMBOL_GPL(node_to_cpu_mask);
-
- /**
- * build_cpu_to_node_map - setup cpu to node and node to cpumask arrays
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-disable-eeh-and-numa.patch new/patches.arch/ppc-kdump-disable-eeh-and-numa.patch
--- old/patches.arch/ppc-kdump-disable-eeh-and-numa.patch 2006-08-01 20:10:19.000000000 +0200
+++ new/patches.arch/ppc-kdump-disable-eeh-and-numa.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-Subject: hide EEH and NUMA support for crashdump kernel builds
-From: olh@suse.de
-References: 175754 - LTC23902, 149586 - LTC21304
-
----
- arch/powerpc/Kconfig | 2 +-
- arch/powerpc/platforms/pseries/Kconfig | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: linux-2.6.16/arch/powerpc/platforms/pseries/Kconfig
-===================================================================
---- linux-2.6.16.orig/arch/powerpc/platforms/pseries/Kconfig
-+++ linux-2.6.16/arch/powerpc/platforms/pseries/Kconfig
-@@ -11,7 +11,7 @@ config PPC_SPLPAR
-
- config EEH
- bool "PCI Extended Error Handling (EEH)" if EMBEDDED
-- depends on PPC_PSERIES
-+ depends on PPC_PSERIES && !CRASH_DUMP
- default y if !EMBEDDED
-
- config SCANLOG
-Index: linux-2.6.16/arch/powerpc/Kconfig
-===================================================================
---- linux-2.6.16.orig/arch/powerpc/Kconfig
-+++ linux-2.6.16/arch/powerpc/Kconfig
-@@ -615,7 +615,7 @@ source "arch/powerpc/platforms/pseries/K
-
- config NUMA
- bool "NUMA support"
-- depends on PPC64
-+ depends on PPC64 && !CRASH_DUMP
- default y if SMP && PPC_PSERIES
-
- config ARCH_SELECT_MEMORY_MODEL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-shutdown-interrupts.patch new/patches.arch/ppc-kdump-shutdown-interrupts.patch
--- old/patches.arch/ppc-kdump-shutdown-interrupts.patch 2006-08-01 20:10:19.000000000 +0200
+++ new/patches.arch/ppc-kdump-shutdown-interrupts.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Subject: [PATCH] powerpc: Disable and EOI interrupts in machine_crash_shutdown()
-From: Michael Ellerman
-Date: Tue, 04 Apr 2006 13:43:01 +0200
-Message-Id: <20060404114306.8DC0F679EF@ozlabs.org>
-
-Bug 152932 - LTC21954 - kdump: js20 stuck after "Brought up 2 CPUs"
-Bug 152925 - LTC21956 - kdump: no input accepted on power5 hvc console
-
-We've seen several bugs caused by interrupt weirdness in the kdump kernel.
-Panicking from an interrupt handler means we fail to EOI the interrupt, and
-so the second kernel never gets that interrupt ever again. We also see hangs
-on JS20 where we take interrupts in the second kernel early during boot.
-
-This patch fixes both those problems, and although it adds more code to the
-crash path I think it is the best solution.
-
-Signed-off-by: Michael Ellerman
-Signed-off-by: Olaf Hering
-
----
- arch/powerpc/kernel/crash.c | 2 ++
- 1 files changed, 2 insertions(+)
-
---- linux-2.6.17.orig/arch/powerpc/kernel/crash.c
-+++ linux-2.6.17/arch/powerpc/kernel/crash.c
-@@ -249,6 +249,8 @@ void crash_kexec_secondary(struct pt_reg
- #else
- static void crash_kexec_prepare_cpus(int cpu)
- {
-+ unsigned int irq;
-+
- /*
- * move the secondarys to us so that we can copy
- * the new kernel 0-0x100 safely
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-kdump-xmon-stop-cpu.patch new/patches.arch/ppc-kdump-xmon-stop-cpu.patch
--- old/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-04-13 13:49:13.000000000 +0200
+++ new/patches.arch/ppc-kdump-xmon-stop-cpu.patch 2006-08-30 14:52:41.000000000 +0200
@@ -2,6 +2,7 @@
From: David Wilder
Date: Mon, 10 Apr 2006 15:32:21 -0700
Message-ID: <443ADCF5.60702@us.ibm.com>
+Patch-mainline: 2.6.19 ?
Bug 149545 - LTC21344-kdump boot panic when a CPU hangs in the first kernel
Bug 149557 - LTC21346-kdump panicks during the system hang when the xmon is enabled
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-reiserfs-cc-optimize.patch new/patches.arch/ppc-reiserfs-cc-optimize.patch
--- old/patches.arch/ppc-reiserfs-cc-optimize.patch 2005-08-27 12:38:37.000000000 +0200
+++ new/patches.arch/ppc-reiserfs-cc-optimize.patch 2006-08-30 14:52:41.000000000 +0200
@@ -1,46 +1,27 @@
-From: olh@suse.de
Subject: only compile with -O1 if the compiler is broken
+From: Olaf Hering
+Only compile with -O1 if the (very old) compiler is broken. We use
+reiserfs alot since SLES9 on ppc64, and it was never seen with gcc33.
+Assume the broken gcc is gcc-3.4 or older.
-Index: linux-2.6.12-rc3-olh/fs/reiserfs/Makefile
-===================================================================
---- linux-2.6.12-rc3-olh.orig/fs/reiserfs/Makefile
-+++ linux-2.6.12-rc3-olh/fs/reiserfs/Makefile
-@@ -21,13 +21,7 @@ ifeq ($(CONFIG_REISERFS_FS_POSIX_ACL),y)
- reiserfs-objs += xattr_acl.o
- endif
-
--# gcc -O2 (the kernel default) is overaggressive on ppc32 when many inline
--# functions are used. This causes the compiler to advance the stack
--# pointer out of the available stack space, corrupting kernel space,
--# and causing a panic. Since this behavior only affects ppc32, this ifeq
--# will work around it. If any other architecture displays this behavior,
--# add it here.
--ifeq ($(CONFIG_PPC32),y)
-+ifeq ($(CONFIG_REISERFS_CC_REDUCE_OPTIMZE),y)
- EXTRA_CFLAGS := -O1
+Signed-off-by: Olaf Hering
+Signed-off-by: Andrew Morton
+---
+
+ fs/reiserfs/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -puN fs/reiserfs/Makefile~use-gcc-o1-in-fs-reiserfs-only-for-ancient-gcc-versions fs/reiserfs/Makefile
+--- a/fs/reiserfs/Makefile~use-gcc-o1-in-fs-reiserfs-only-for-ancient-gcc-versions
++++ a/fs/reiserfs/Makefile
+@@ -28,7 +28,7 @@ endif
+ # will work around it. If any other architecture displays this behavior,
+ # add it here.
+ ifeq ($(CONFIG_PPC32),y)
+-EXTRA_CFLAGS := -O1
++EXTRA_CFLAGS := $(call cc-ifversion, -lt, 0400, -O1)
endif
-Index: linux-2.6.12-rc3-olh/fs/Kconfig
-===================================================================
---- linux-2.6.12-rc3-olh.orig/fs/Kconfig
-+++ linux-2.6.12-rc3-olh/fs/Kconfig
-@@ -186,6 +186,18 @@ config REISERFS_FS
- If you like it, you can pay us to add new features to it that you
- need, buy a support contract, or pay us to port it to another OS.
-
-+config REISERFS_CC_REDUCE_OPTIMZE
-+ bool "Reduce CC optimization level to workaround compiler bugs"
-+ depends on PPC32
-+ default n
-+ help
-+ gcc -O2 (the kernel default) is overaggressive on ppc32 when many inline
-+ functions are used. This causes the compiler to advance the stack
-+ pointer out of the available stack space, corrupting kernel space,
-+ and causing a panic. Since this behavior only affects ppc32, this ifeq
-+ will work around it. If any other architecture displays this behavior,
-+ add it here.
-+
- config REISERFS_CHECK
- bool "Enable reiserfs debug mode"
- depends on REISERFS_FS
+ TAGS:
+_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-update_gtod-race.patch new/patches.arch/ppc-update_gtod-race.patch
--- old/patches.arch/ppc-update_gtod-race.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/ppc-update_gtod-race.patch 2006-08-30 14:35:32.000000000 +0200
@@ -0,0 +1,145 @@
+Subject: fix gettimeofday vs. update_gtod race
+From: Paul Mackerras
+References: 197699 , LTC24884 , 202146
+
+breaks ppc32, so make it 64bit only for the time being:
+
+
+Userspace can (very, very) occasionally get bogus time values due to
+a tiny race between powerpc's do_gettimeofday and timer interrupt:
+
+1. do_gettimeofday does get_tb()
+
+2. decrementer exception on boot cpu which runs timer_recalc_offset,
+ which also samples the timebase and updates the do_gtod structure
+ with a greater timebase value.
+
+3. do_gettimeofday calls __do_gettimeofday, which leads to the
+ negative result from tb_val - temp_varp->tb_orig_stamp.
+
+The fix is to ensure that do_gettimeofday samples the timebase only
+after loading do_gtod.varp.
+
+
+Signed-off-by: Nathan Lynch
+Signed-off-by: Olaf Hering
+
+
+
+This patch should fix it. The problem was that I was comparing a
+32-bit quantity with a 64-bit quantity, and consequently time wasn't
+advancing. This makes us use a 64-bit quantity on all platforms,
+which ends up simplifying the code since we can now get rid of the
+tb_last_stamp variable (which actually fixes another bug that Ben H
+and I noticed while going carefully through the code).
+
+This works fine on my G4 tibook. Let me know how it goes on your
+machines.
+
+Paul.
+
+---
+ arch/powerpc/kernel/time.c | 25 ++++++++-----------------
+ include/asm-powerpc/time.h | 4 ----
+ 2 files changed, 8 insertions(+), 21 deletions(-)
+
+Index: linux-2.6.17/arch/powerpc/kernel/time.c
+===================================================================
+--- linux-2.6.17.orig/arch/powerpc/kernel/time.c
++++ linux-2.6.17/arch/powerpc/kernel/time.c
+@@ -125,15 +125,8 @@ static long timezone_offset;
+ unsigned long ppc_proc_freq;
+ unsigned long ppc_tb_freq;
+
+-u64 tb_last_jiffy __cacheline_aligned_in_smp;
+-unsigned long tb_last_stamp;
+-
+-/*
+- * Note that on ppc32 this only stores the bottom 32 bits of
+- * the timebase value, but that's enough to tell when a jiffy
+- * has passed.
+- */
+-DEFINE_PER_CPU(unsigned long, last_jiffy);
++static u64 tb_last_jiffy __cacheline_aligned_in_smp;
++static DEFINE_PER_CPU(u64, last_jiffy);
+
+ #ifdef CONFIG_VIRT_CPU_ACCOUNTING
+ /*
+@@ -458,7 +451,7 @@ void do_gettimeofday(struct timeval *tv)
+ do {
+ seq = read_seqbegin_irqsave(&xtime_lock, flags);
+ sec = xtime.tv_sec;
+- nsec = xtime.tv_nsec + tb_ticks_since(tb_last_stamp);
++ nsec = xtime.tv_nsec + tb_ticks_since(tb_last_jiffy);
+ } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
+ usec = nsec / 1000;
+ while (usec >= 1000000) {
+@@ -700,7 +693,6 @@ void timer_interrupt(struct pt_regs * re
+ tb_next_jiffy = tb_last_jiffy + tb_ticks_per_jiffy;
+ if (per_cpu(last_jiffy, cpu) >= tb_next_jiffy) {
+ tb_last_jiffy = tb_next_jiffy;
+- tb_last_stamp = per_cpu(last_jiffy, cpu);
+ do_timer(regs);
+ timer_recalc_offset(tb_last_jiffy);
+ timer_check_rtc();
+@@ -749,7 +741,7 @@ void __init smp_space_timers(unsigned in
+ int i;
+ unsigned long half = tb_ticks_per_jiffy / 2;
+ unsigned long offset = tb_ticks_per_jiffy / max_cpus;
+- unsigned long previous_tb = per_cpu(last_jiffy, boot_cpuid);
++ u64 previous_tb = per_cpu(last_jiffy, boot_cpuid);
+
+ /* make sure tb > per_cpu(last_jiffy, cpu) for all cpus always */
+ previous_tb -= tb_ticks_per_jiffy;
+@@ -830,7 +822,7 @@ int do_settimeofday(struct timespec *tv)
+ * and therefore the (jiffies - wall_jiffies) computation
+ * has been removed.
+ */
+- tb_delta = tb_ticks_since(tb_last_stamp);
++ tb_delta = tb_ticks_since(tb_last_jiffy);
+ tb_delta = mulhdu(tb_delta, do_gtod.varp->tb_to_xs); /* in xsec */
+ new_nsec -= SCALE_XSEC(tb_delta, 1000000000);
+
+@@ -950,8 +942,7 @@ void __init time_init(void)
+ if (__USE_RTC()) {
+ /* 601 processor: dec counts down by 128 every 128ns */
+ ppc_tb_freq = 1000000000;
+- tb_last_stamp = get_rtcl();
+- tb_last_jiffy = tb_last_stamp;
++ tb_last_jiffy = get_rtcl();
+ } else {
+ /* Normal PowerPC with timebase register */
+ ppc_md.calibrate_decr();
+@@ -959,7 +950,7 @@ void __init time_init(void)
+ ppc_tb_freq / 1000000, ppc_tb_freq % 1000000);
+ printk(KERN_DEBUG "time_init: processor frequency = %lu.%.6lu MHz\n",
+ ppc_proc_freq / 1000000, ppc_proc_freq % 1000000);
+- tb_last_stamp = tb_last_jiffy = get_tb();
++ tb_last_jiffy = get_tb();
+ }
+
+ tb_ticks_per_jiffy = ppc_tb_freq / HZ;
+@@ -1036,7 +1027,7 @@ void __init time_init(void)
+ do_gtod.varp = &do_gtod.vars[0];
+ do_gtod.var_idx = 0;
+ do_gtod.varp->tb_orig_stamp = tb_last_jiffy;
+- __get_cpu_var(last_jiffy) = tb_last_stamp;
++ __get_cpu_var(last_jiffy) = tb_last_jiffy;
+ do_gtod.varp->stamp_xsec = (u64) xtime.tv_sec * XSEC_PER_SEC;
+ do_gtod.tb_ticks_per_sec = tb_ticks_per_sec;
+ do_gtod.varp->tb_to_xs = tb_to_xs;
+Index: linux-2.6.17/include/asm-powerpc/time.h
+===================================================================
+--- linux-2.6.17.orig/include/asm-powerpc/time.h
++++ linux-2.6.17/include/asm-powerpc/time.h
+@@ -30,10 +30,6 @@ extern unsigned long tb_ticks_per_usec;
+ extern unsigned long tb_ticks_per_sec;
+ extern u64 tb_to_xs;
+ extern unsigned tb_to_us;
+-extern unsigned long tb_last_stamp;
+-extern u64 tb_last_jiffy;
+-
+-DECLARE_PER_CPU(unsigned long, last_jiffy);
+
+ struct rtc_time;
+ extern void to_tm(int tim, struct rtc_time * tm);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/s390-raw-device new/patches.arch/s390-raw-device
--- old/patches.arch/s390-raw-device 2006-05-19 16:57:15.000000000 +0200
+++ new/patches.arch/s390-raw-device 1970-01-01 01:00:00.000000000 +0100
@@ -1,42 +0,0 @@
-From: ihno@suse.de
-Subject: [PATCH] raw module is no enabled on s390/s390x
-
-The raw module is not enabled on s390/ss390x
-The patch fixes that
-
-Signed-off-by: Ihno Krumreich
----
- drivers/s390/Kconfig | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-Index: linux-2.6.16/drivers/s390/Kconfig
-===================================================================
---- linux-2.6.16.orig/drivers/s390/Kconfig
-+++ linux-2.6.16/drivers/s390/Kconfig
-@@ -51,6 +51,26 @@ config UNIX98_PTY_COUNT
- When not in use, each additional set of 256 PTYs occupy
- approximately 8 KB of kernel memory on 32-bit architectures.
-
-+config RAW_DRIVER
-+ tristate "RAW driver (/dev/raw/rawN) (OBSOLETE)"
-+ help
-+ The raw driver permits block devices to be bound to /dev/raw/rawN.
-+ Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O.
-+ See the raw(8) manpage for more details.
-+
-+ The raw driver is deprecated and may be removed from 2.7
-+ kernels. Applications should simply open the device (eg /dev/hda1)
-+ with the O_DIRECT flag.
-+
-+config MAX_RAW_DEVS
-+ int "Maximum number of RAW devices to support (1-8192)"
-+ depends on RAW_DRIVER
-+ default "256"
-+ help
-+ The maximum number of RAW devices that are supported.
-+ Default is 256. Increase this number in case you need lots of
-+ raw devices.
-+
- config HANGCHECK_TIMER
- tristate "Hangcheck timer"
- help
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-nmi-watchdog-timeout new/patches.arch/x86_64-nmi-watchdog-timeout
--- old/patches.arch/x86_64-nmi-watchdog-timeout 2006-03-31 14:37:54.000000000 +0200
+++ new/patches.arch/x86_64-nmi-watchdog-timeout 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-From: ak@suse.de
-Patch-mainline: never
-Subject: Increase NMI watchdog timeout to 30s
-Patch-mainline: never
-
-Be a bit more tolerant to broken drivers.
-Defensive programming for enterprises.
-
-diff -u linux-2.6.15/arch/x86_64/kernel/nmi.c-o linux-2.6.15/arch/x86_64/kernel/nmi.c
---- linux-2.6.15/arch/x86_64/kernel/nmi.c-o 2005-10-30 16:09:03.000000000 +0100
-+++ linux-2.6.15/arch/x86_64/kernel/nmi.c 2006-01-09 17:28:39.000000000 +0100
-@@ -479,10 +479,10 @@
- if (!touched && __get_cpu_var(last_irq_sum) == sum) {
- /*
- * Ayiee, looks like this CPU is stuck ...
-- * wait a few IRQs (5 seconds) before doing the oops ...
-+ * wait a few IRQs (30 seconds) before doing the oops ...
- */
- local_inc(&__get_cpu_var(alert_counter));
-- if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz) {
-+ if (local_read(&__get_cpu_var(alert_counter)) == 30*nmi_hz) {
- if (notify_die(DIE_NMI, "nmi", regs, reason, 2, SIGINT)
- == NOTIFY_STOP) {
- local_set(&__get_cpu_var(alert_counter), 0);
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/sis5513-support-sis-965l new/patches.drivers/sis5513-support-sis-965l
--- old/patches.drivers/sis5513-support-sis-965l 2006-08-01 20:10:20.000000000 +0200
+++ new/patches.drivers/sis5513-support-sis-965l 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-From: Rudolph Pereira
-Subject: Add sis 965l suppor for the sis5513 ide driver
-Patch-mainline: 2.6.17
-References: 122015
-
-Cc: Bartlomiej Zolnierkiewicz
-Signed-off-by: Andrew Morton
-Acked-by: Jens Axboe
-
----
-
- drivers/ide/pci/sis5513.c | 6 ++++++
- 1 files changed, 6 insertions(+)
-
-diff -puN drivers/ide/pci/sis5513.c~sis5513-support-sis-965l drivers/ide/pci/sis5513.c
---- devel/drivers/ide/pci/sis5513.c~sis5513-support-sis-965l 2005-09-15 21:11:05.000000000 -0700
-+++ devel-akpm/drivers/ide/pci/sis5513.c 2005-09-15 21:11:43.000000000 -0700
-@@ -777,7 +777,12 @@ static unsigned int __devinit init_chips
- pci_write_config_dword(dev, 0x54, idemisc | 0x40000000);
- printk(KERN_INFO "SIS5513: Switching to 5513 register mapping\n");
- }
-+ } else if (trueid == 0x180) { /* sis965L */
-+ chipset_family = ATA_133;
-+ printk(KERN_INFO "SIS5513: SiS 965 IDE "
-+ "UDMA133 controller\n");
- }
-+
- }
-
- if (!chipset_family) { /* Belongs to pci-quirks */
-@@ -952,6 +957,7 @@ static int __devinit sis5513_init_one(st
- static struct pci_device_id sis5513_pci_tbl[] = {
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5518, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-+ { PCI_VENDOR_ID_SI, 0x180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { 0, },
- };
- MODULE_DEVICE_TABLE(pci, sis5513_pci_tbl);
-_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/smbfs-request-counting new/patches.drivers/smbfs-request-counting
--- old/patches.drivers/smbfs-request-counting 2004-06-09 15:34:54.000000000 +0200
+++ new/patches.drivers/smbfs-request-counting 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-Index: linux-2.6.5/fs/smbfs/request.c
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/request.c 2004-06-09 15:20:07.000000000 +0200
-+++ linux-2.6.5/fs/smbfs/request.c 2004-06-09 15:20:59.000000000 +0200
-@@ -112,6 +112,7 @@
- #else
- /* FIXME: we want something like nfs does above, but that
- requires changes to all callers and can wait. */
-+ atomic_dec(&server->nr_requests);
- break;
- #endif
- }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/smbfs-sendqueue-backoff new/patches.drivers/smbfs-sendqueue-backoff
--- old/patches.drivers/smbfs-sendqueue-backoff 2005-02-24 11:19:36.000000000 +0100
+++ new/patches.drivers/smbfs-sendqueue-backoff 1970-01-01 01:00:00.000000000 +0100
@@ -1,175 +0,0 @@
-Subject: smbfs: back off sending when TCP buffers are full
-From: Olaf Kirch
-References: SUSE41343 - LTC8669
-
-This patch makes sure we gracefully back off if the TCP send buffer
-is full, or if TCP was unable to allocate an skb. Otherwise, smbiod
-would spin endlessly, and never release the CPU.
-
-Index: linux-2.6.5/fs/smbfs/proc.c
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/proc.c 2004-03-12 12:17:25.000000000 +0100
-+++ linux-2.6.5/fs/smbfs/proc.c 2004-06-08 14:40:43.000000000 +0200
-@@ -901,6 +901,7 @@
-
- /* chain into the data_ready callback */
- server->data_ready = xchg(&sk->sk_data_ready, smb_data_ready);
-+ server->write_space = xchg(&sk->sk_write_space, smb_write_space);
-
- /* check if we have an old smbmount that uses seconds for the
- serverzone */
-Index: linux-2.6.5/fs/smbfs/proto.h
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/proto.h 2004-02-04 04:43:57.000000000 +0100
-+++ linux-2.6.5/fs/smbfs/proto.h 2004-06-08 14:39:40.000000000 +0200
-@@ -48,6 +48,7 @@
- extern int smb_fill_cache(struct file *filp, void *dirent, filldir_t filldir, struct smb_cache_control *ctrl, struct qstr *qname, struct smb_fattr *entry);
- /* sock.c */
- extern void smb_data_ready(struct sock *sk, int len);
-+extern void smb_write_space(struct sock *sk);
- extern int smb_valid_socket(struct inode *inode);
- extern void smb_close_socket(struct smb_sb_info *server);
- extern int smb_recv_available(struct smb_sb_info *server);
-Index: linux-2.6.5/fs/smbfs/request.c
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/request.c 2004-03-12 12:17:25.000000000 +0100
-+++ linux-2.6.5/fs/smbfs/request.c 2004-06-08 14:34:15.000000000 +0200
-@@ -316,7 +316,7 @@
- if (server->state == CONN_VALID) {
- if (list_empty(&server->xmitq))
- result = smb_request_send_req(req);
-- if (result < 0) {
-+ if (result < 0 && result != -EAGAIN) {
- /* Connection lost? */
- server->conn_error = result;
- server->state = CONN_INVALID;
-@@ -394,7 +394,6 @@
- if (result < 0 && result != -EAGAIN)
- goto out;
-
-- result = 0;
- if (!(req->rq_flags & SMB_REQ_TRANSMITTED))
- goto out;
-
-@@ -431,7 +430,7 @@
- return 0;
-
- result = smb_request_send_req(req);
-- if (result < 0) {
-+ if (result < 0 && result != -EAGAIN) {
- server->conn_error = result;
- list_del_init(&req->rq_queue);
- list_add(&req->rq_queue, &server->xmitq);
-Index: linux-2.6.5/fs/smbfs/smbiod.c
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/smbiod.c 2004-03-12 12:17:25.000000000 +0100
-+++ linux-2.6.5/fs/smbfs/smbiod.c 2004-06-08 14:56:32.000000000 +0200
-@@ -45,7 +45,9 @@
- static LIST_HEAD(smb_servers);
- static spinlock_t servers_lock = SPIN_LOCK_UNLOCKED;
-
--#define SMBIOD_DATA_READY (1<<0)
-+#define SMBIOD_DATA_READY 0
-+#define SMBIOD_BACKOFF 1
-+
- static long smbiod_flags;
-
- static int smbiod(void *);
-@@ -268,6 +270,18 @@
-
- do {
- result = smb_request_send_server(server);
-+ if (result == -EAGAIN) {
-+ /* TCP was unable to allocate memory.
-+ * Set the backoff flag, but *not* DATA_READY.
-+ * If there are no new requests in the queue,
-+ * this will cause smbiod to back off and
-+ * not retry until
-+ * a) we receive a write_space callback from TCP
-+ * b) we slept for one second.
-+ */
-+ set_bit(SMBIOD_BACKOFF, &smbiod_flags);
-+ goto out;
-+ }
- if (result < 0) {
- server->state = CONN_INVALID;
- smbiod_retry(server);
-@@ -300,9 +314,28 @@
- struct smb_sb_info *server;
- struct list_head *pos, *n;
-
-- /* FIXME: Use poll? */
-- wait_event_interruptible(smbiod_wait,
-- test_bit(SMBIOD_DATA_READY, &smbiod_flags));
-+ /* smbiod should use a more sophisticated approach
-+ * to polling the socket... this is an ugly hack.
-+ */
-+ if (test_bit(SMBIOD_BACKOFF, &smbiod_flags)) {
-+ /* We tried to transmit some requests, but received
-+ * EAGAIN. Either the TCP send queue is full, or
-+ * we're low on memory. Go to sleep.
-+ * If this was due to a full receive queue, the
-+ * write_space callback handler will wake us.
-+ *
-+ * If it was low memory, we'll just sleep a little
-+ * to let the VM do its job.
-+ */
-+ wait_event_interruptible_timeout(smbiod_wait,
-+ test_bit(SMBIOD_DATA_READY, &smbiod_flags),
-+ HZ);
-+ clear_bit(SMBIOD_BACKOFF, &smbiod_flags);
-+ } else {
-+ wait_event_interruptible(smbiod_wait,
-+ test_bit(SMBIOD_DATA_READY, &smbiod_flags));
-+ }
-+
- if (signal_pending(current)) {
- spin_lock(&servers_lock);
- smbiod_state = SMBIOD_DEAD;
-Index: linux-2.6.5/fs/smbfs/sock.c
-===================================================================
---- linux-2.6.5.orig/fs/smbfs/sock.c 2004-04-05 11:09:50.000000000 +0200
-+++ linux-2.6.5/fs/smbfs/sock.c 2004-06-08 14:44:10.000000000 +0200
-@@ -84,6 +84,25 @@
- smbiod_wake_up();
- }
-
-+/*
-+ * Called when there's room in the TCP send queue.
-+ * Just wake up smbiod so it can retry sending.
-+ */
-+void
-+smb_write_space(struct sock *sk)
-+{
-+ struct smb_sb_info *server = server_from_socket(sk->sk_socket);
-+ void (*write_space)(struct sock *) = server->write_space;
-+
-+ /* Invoke the original sk_write_space callback.
-+ * I don't think we actually need to do this, but I'll
-+ * do that for symmetry with smb_data_ready above.
-+ */
-+ write_space(sk);
-+ VERBOSE("(%p)\n", sk);
-+ smbiod_wake_up();
-+}
-+
- int
- smb_valid_socket(struct inode * inode)
- {
-Index: linux-2.6.5/include/linux/smb_fs_sb.h
-===================================================================
---- linux-2.6.5.orig/include/linux/smb_fs_sb.h 2004-02-04 04:44:44.000000000 +0100
-+++ linux-2.6.5/include/linux/smb_fs_sb.h 2004-06-08 14:42:02.000000000 +0200
-@@ -68,8 +68,10 @@
- u32 smb_len;
- u32 smb_read;
-
-- /* We use our own data_ready callback, but need the original one */
-+ /* We use our own data_ready and write_space callbacks,
-+ * but need the original ones */
- void *data_ready;
-+ void *write_space;
-
- /* nls pointers for codepage conversions */
- struct nls_table *remote_nls;
-
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ia64-put-user-size new/patches.fixes/ia64-put-user-size
--- old/patches.fixes/ia64-put-user-size 2005-11-21 15:57:02.000000000 +0100
+++ new/patches.fixes/ia64-put-user-size 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-Subject: Fix asm constraint
-From: schwab@suse.de
-
---- linux-2.6.14/include/asm-ia64/uaccess.h.~1~ 2005-10-28 02:02:08.000000000 +0200
-+++ linux-2.6.14/include/asm-ia64/uaccess.h 2005-11-20 18:15:46.559296784 +0100
-@@ -154,10 +154,10 @@ do { \
- # define __put_user_size(val, addr, n, err) \
- do { \
- register long __pu_r8 asm ("r8") = 0; \
-- asm volatile ("\n[1:]\tst"#n" %1=%r2%P1\t// %0 gets overwritten by exception handler\n" \
-+ asm volatile ("\n[1:]\tst"#n" [%1]=%r2\t// %0 gets overwritten by exception handler\n" \
- "\t.xdata4 \"__ex_table\", 1b-., 1f-.\n" \
- "[1:]" \
-- : "=r"(__pu_r8) : "m"(__m(addr)), "rO"(val), "0"(__pu_r8)); \
-+ : "=r"(__pu_r8) : "r"(addr), "rO"(val), "0"(__pu_r8)); \
- (err) = __pu_r8; \
- } while (0)
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ignore-aix-disk-label.patch new/patches.fixes/ignore-aix-disk-label.patch
--- old/patches.fixes/ignore-aix-disk-label.patch 2006-08-01 20:10:20.000000000 +0200
+++ new/patches.fixes/ignore-aix-disk-label.patch 2006-08-30 14:52:41.000000000 +0200
@@ -1,6 +1,7 @@
Subject: ignore partition table on disks with AIX label
From: olh@suse.de
References: 175995
+Patch-mainline: 2.6.19 ?
The on-disk data structures from AIX are not known, also the filesystem
layout is not known. There is a msdos partition signature at the end of
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-add-addr-install-dstentry new/patches.fixes/ipv6-add-addr-install-dstentry
--- old/patches.fixes/ipv6-add-addr-install-dstentry 2006-06-19 11:48:51.000000000 +0200
+++ new/patches.fixes/ipv6-add-addr-install-dstentry 2006-08-29 18:25:50.000000000 +0200
@@ -14,9 +14,14 @@
Acked-by: jbeulich@novell.com
Acked-by: okir@suse.de
---- linux-2.6.16.13-old/net/ipv6/addrconf.c 2006-05-02 22:38:44.000000000 +0100
-+++ linux-2.6.16.13-new/net/ipv6/addrconf.c 2006-06-18 10:16:50.000000000 +0100
-@@ -549,6 +549,8 @@
+ net/ipv6/addrconf.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: build/net/ipv6/addrconf.c
+===================================================================
+--- build.orig/net/ipv6/addrconf.c
++++ build/net/ipv6/addrconf.c
+@@ -578,6 +578,8 @@ ipv6_add_addr(struct inet6_dev *idev, co
ifa->flags = flags | IFA_F_TENTATIVE;
ifa->cstamp = ifa->tstamp = jiffies;
@@ -25,7 +30,7 @@
ifa->idev = idev;
in6_dev_hold(idev);
/* For caller */
-@@ -575,8 +577,6 @@
+@@ -603,8 +605,6 @@ ipv6_add_addr(struct inet6_dev *idev, co
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-init-fail-cleanup new/patches.fixes/ipv6-init-fail-cleanup
--- old/patches.fixes/ipv6-init-fail-cleanup 2005-11-11 11:05:15.000000000 +0100
+++ new/patches.fixes/ipv6-init-fail-cleanup 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-From: Olaf Kirch
-Subject: inet6_init: cleanup after failed initialization
-References: 132894
-
- When initialization fails in inet6_init(), we need to
- unregister the PF_INET6 socket ops.
-
-Signed-off-by: Olaf Kirch
-
-Index: linux-2.6.14/net/ipv6/af_inet6.c
-===================================================================
---- linux-2.6.14.orig/net/ipv6/af_inet6.c
-+++ linux-2.6.14/net/ipv6/af_inet6.c
-@@ -797,6 +797,7 @@ icmp_fail:
- #endif
- cleanup_ipv6_mibs();
- out_unregister_raw_proto:
-+ sock_unregister(PF_INET6);
- proto_unregister(&rawv6_prot);
- out_unregister_udp_proto:
- proto_unregister(&udpv6_prot);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/libata-increase-timeout-for-resume new/patches.fixes/libata-increase-timeout-for-resume
--- old/patches.fixes/libata-increase-timeout-for-resume 2006-08-01 20:10:20.000000000 +0200
+++ new/patches.fixes/libata-increase-timeout-for-resume 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-From: Mark Lord
-Subject: Increase BSY/DRQ clear to avoid timeout on resume
-Patch-mainline: 2.6.17
-References:
-
-Acked-by:
-Signed-off-by: Jens Axboe
-
-diff -u --recursive --new-file --exclude='.*' linux-2.6.15-rc2/include/linux/libata.h linux/include/linux/libata.h
---- linux-2.6.15-rc2/include/linux/libata.h 2005-11-21 12:11:53.000000000 -0500
-+++ linux/include/linux/libata.h 2005-11-21 12:11:19.000000000 -0500
-@@ -634,7 +634,7 @@
-
- static inline u8 ata_wait_idle(struct ata_port *ap)
- {
-- u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
-+ u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 100000); /* 1000msec */
-
- if (status & (ATA_BUSY | ATA_DRQ)) {
- unsigned long l = ap->ioaddr.status_addr;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfsv4-setclientid new/patches.fixes/nfsv4-setclientid
--- old/patches.fixes/nfsv4-setclientid 2006-06-27 00:50:28.000000000 +0200
+++ new/patches.fixes/nfsv4-setclientid 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-From: NeilBrown
-Subject: Improve unqiueness of client id sent by NFSv4
-Patch-mainline: not yet
-References: 167953
-
-When the NFS client creates locking state on the server, it used
-SETCLIENTID which requires the creation of a unique identifier for
-the client.
-
-To handle cases where the server might claim an identifer is already
-in use, the client has a numerical 'uniquifier' which is incremented
-on failure.
-Because buffer available for this unique name is only 31 chars,
-and because the uniquifier is at the end, it can sometimes
-be left off thus making it completely useless.
-
-This patch moves the uniquifier to the start so it will always have
-a valuable effect.
-
-Normally the uniquifier should not be needed as the client's IP address
-is already in the string. However on (some?) suse clients, the
-IP address is determined to be 127.0.0.2, which isn't very useful.
-
-We could make the buffer larger (the protocol limit is 1024) but
-this seems like a smaller change.
-
-IP address comes from the 'mount' program and it should be enhanced to
-make a better attempt at getting a good IP address. Work is proceeding
-on that. However this patch is simple and reasonably effective.
-
-Without this patch, multiple clients can end up being serialised causing
-incredibly slow throughput.
-
-Signed-off-by: Neil Brown
-
-Index: linux-2.6.16/fs/nfs/nfs4proc.c
-===================================================================
---- linux-2.6.16.orig/fs/nfs/nfs4proc.c 2006-06-20 12:43:19.000000000 +1000
-+++ linux-2.6.16/fs/nfs/nfs4proc.c 2006-06-20 12:44:38.000000000 +1000
-@@ -2873,10 +2873,10 @@
-
- for(;;) {
- setclientid.sc_name_len = scnprintf(setclientid.sc_name,
-- sizeof(setclientid.sc_name), "%s/%u.%u.%u.%u %s %u",
-+ sizeof(setclientid.sc_name), "%u %s/%u.%u.%u.%u %s",
-+ clp->cl_id_uniquifier,
- clp->cl_ipaddr, NIPQUAD(clp->cl_addr.s_addr),
-- cred->cr_ops->cr_name,
-- clp->cl_id_uniquifier);
-+ cred->cr_ops->cr_name);
- setclientid.sc_netid_len = scnprintf(setclientid.sc_netid,
- sizeof(setclientid.sc_netid), "tcp");
- setclientid.sc_uaddr_len = scnprintf(setclientid.sc_uaddr,
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 2005-11-16 13:57:37.000000000 +0100
+++ new/patches.fixes/parport-mutex 2006-08-29 18:25:50.000000000 +0200
@@ -16,14 +16,18 @@
The patch below simply protects that code with the port_mutex in order to
protect against simultaneous calls to lp_read/lp_write.
-Similar protection may be required for ioctl(LPRESET).
+Similar protection is probably required for ioctl(LPRESET).
Signed-off-by: okir@suse.de
-diff -urNp linux-2.6.5/drivers/char/lp.c linux-2.6.5.SUSE/drivers/char/lp.c
---- linux-2.6.5/drivers/char/lp.c 2004-04-04 05:36:14.000000000 +0200
-+++ linux-2.6.5.SUSE/drivers/char/lp.c 2004-11-09 11:22:58.516929048 +0100
-@@ -608,9 +608,12 @@ static int lp_ioctl(struct inode *inode,
+ 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,
return -EFAULT;
break;
case LPGETSTATUS:
@@ -34,5 +38,5 @@
lp_release_parport (&lp_table[minor]);
+ up (&lp_table[minor].port_mutex);
- if (copy_to_user((int *) arg, &status, sizeof(int)))
+ if (copy_to_user(argp, &status, sizeof(int)))
return -EFAULT;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/samsung-unusual-floppy new/patches.fixes/samsung-unusual-floppy
--- old/patches.fixes/samsung-unusual-floppy 2005-10-27 14:22:17.000000000 +0200
+++ new/patches.fixes/samsung-unusual-floppy 2006-08-29 18:25:50.000000000 +0200
@@ -1,11 +1,14 @@
From: juergen.mell@t-online.de
Subject: USB floppy drive SAMSUNG SFD-321U/EP detected 8 times
-Patch-mainline: no
+Patch-mainline: 2.6.19
References: 117643
USB floppy drive SAMSUNG SFD-321U/EP detected 8 times
+Is in gregkh's USB tree and the -mm release
+
Acked-by: mantel@suse.de
+Signed-off-by: Greg Kroah-Hartman
diff -urNp linux-2.6.13/drivers/usb/storage/unusual_devs.h linux-2.6.13.SUSE/drivers/usb/storage/unusual_devs.h
--- linux-2.6.13/drivers/usb/storage/unusual_devs.h 2005-10-27 14:16:25.369102521 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tulip-down-race new/patches.fixes/tulip-down-race
--- old/patches.fixes/tulip-down-race 2006-06-02 15:58:06.000000000 +0200
+++ new/patches.fixes/tulip-down-race 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-From: Grant Grundler
-Subject: Fix MCA in tulip driver
-Patch-mainline: yes
-References: 163975
-
-This patch fixes a race condition in the tulip driver, which is exposed
-when yoyo-ing the NIC (ie rapidly upping/downing the device).
-
-Acked-by: okir@suse.de
-Acked-by: gregkh@suse.de
-
- drivers/net/tulip/tulip_core.c | 9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-Index: linux-2.6.16/drivers/net/tulip/tulip_core.c
-===================================================================
---- linux-2.6.16.orig/drivers/net/tulip/tulip_core.c
-+++ linux-2.6.16/drivers/net/tulip/tulip_core.c
-@@ -18,11 +18,11 @@
-
- #define DRV_NAME "tulip"
- #ifdef CONFIG_TULIP_NAPI
--#define DRV_VERSION "1.1.13-NAPI" /* Keep at least for test */
-+#define DRV_VERSION "1.1.14-NAPI" /* Keep at least for test */
- #else
--#define DRV_VERSION "1.1.13"
-+#define DRV_VERSION "1.1.14"
- #endif
--#define DRV_RELDATE "May 11, 2002"
-+#define DRV_RELDATE "May 31, 2006"
-
-
- #include
-@@ -774,14 +774,13 @@ static int tulip_close (struct net_devic
- int i;
-
- netif_stop_queue (dev);
--
-+ free_irq (dev->irq, dev); /* don't let IRQs race w/tulip_down() */
- tulip_down (dev);
-
- if (tulip_debug > 1)
- printk (KERN_DEBUG "%s: Shutting down ethercard, status was %2.2x.\n",
- dev->name, ioread32 (ioaddr + CSR5));
-
-- free_irq (dev->irq, dev);
-
- /* Free all the skbuffs in the Rx queue. */
- for (i = 0; i < RX_RING_SIZE; i++) {
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 2005-02-24 11:19:36.000000000 +0100
+++ new/patches.fixes/tulip-quad-NIC-ifdown 2006-08-29 18:25:50.000000000 +0200
@@ -8,11 +8,14 @@
Acked-by: Olaf Kirch
-Index: linux-2.6.9/drivers/net/tulip/tulip_core.c
+ drivers/net/tulip/tulip_core.c | 4 ++++
+ 1 files changed, 4 insertions(+)
+
+Index: build/drivers/net/tulip/tulip_core.c
===================================================================
---- linux-2.6.9.orig/drivers/net/tulip/tulip_core.c 2005-01-03 12:33:08.000000000 +0100
-+++ linux-2.6.9/drivers/net/tulip/tulip_core.c 2005-01-03 12:34:58.000000000 +0100
-@@ -1770,6 +1771,10 @@ static void __devexit tulip_remove_one (
+--- build.orig/drivers/net/tulip/tulip_core.c
++++ build/drivers/net/tulip/tulip_core.c
+@@ -1795,6 +1795,10 @@ static void __devexit tulip_remove_one (
return;
tp = netdev_priv(dev);
@@ -23,4 +26,3 @@
unregister_netdev(dev);
pci_free_consistent (pdev,
sizeof (struct tulip_rx_desc) * RX_RING_SIZE +
-
++++++ patches.kernel.org.tar.bz2 ++++++
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi-oldboot new/patches.suse/acpi-oldboot
--- old/patches.suse/acpi-oldboot 2006-08-02 23:03:01.000000000 +0200
+++ new/patches.suse/acpi-oldboot 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Subject: make acpi=oldboot an alias for acpi=ht for compatibility with SLES8
-
-diff -u linux/arch/i386/kernel/setup.c-o linux/arch/i386/kernel/setup.c
---- linux/arch/i386/kernel/setup.c-o 2004-05-18 10:55:53.000000000 +0200
-+++ linux/arch/i386/kernel/setup.c 2004-05-24 13:07:28.000000000 +0200
-@@ -602,7 +602,7 @@
- }
-
- /* Limit ACPI just to boot-time to enable HT */
-- else if (!memcmp(from, "acpi=ht", 7)) {
-+ else if (!memcmp(from, "acpi=ht", 7) || !memcmp(from,"acpi=oldboot",12)) {
- if (!acpi_force)
- disable_acpi();
- acpi_ht = 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/acpi_dsdt_initrd_initramfs new/patches.suse/acpi_dsdt_initrd_initramfs
--- old/patches.suse/acpi_dsdt_initrd_initramfs 2006-08-01 20:10:21.000000000 +0200
+++ new/patches.suse/acpi_dsdt_initrd_initramfs 2006-08-29 18:25:50.000000000 +0200
@@ -7,14 +7,14 @@
("INITRDDSDT123DSDT123"). Once a DSDT in the initramfs or
initrd is found the DSDT provided by BIOS is replaced.
----
- drivers/acpi/Kconfig | 13 +++++++
- drivers/acpi/osl.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 95 insertions(+), 5 deletions(-)
+In order for the data to be available, populate_rootfs()
+should be called prior to acpi_early_init(). Then,
+the ACPI code can just call sys_open() to get the DSDT.
---- linux-2.6.17.orig/drivers/acpi/Kconfig
-+++ linux-2.6.17/drivers/acpi/Kconfig
-@@ -364,6 +364,19 @@ config ACPI_SBS
+diff -ruNpX dontdiff linux-2.6.17/drivers/acpi/Kconfig linux-2.6.17.acpi/drivers/acpi/Kconfig
+--- linux-2.6.17/drivers/acpi/Kconfig 2006-08-29 11:47:54.000000000 -0400
++++ linux-2.6.17.acpi/drivers/acpi/Kconfig 2006-08-29 11:48:45.000000000 -0400
+@@ -362,6 +362,19 @@ config ACPI_SBS
A "Smart Battery" is quite old and quite rare compared
to today's ACPI "Control Method" battery.
@@ -34,9 +34,10 @@
endif # ACPI
endmenu
---- linux-2.6.17.orig/drivers/acpi/osl.c
-+++ linux-2.6.17/drivers/acpi/osl.c
-@@ -44,6 +44,8 @@
+diff -ruNpX dontdiff linux-2.6.17/drivers/acpi/osl.c linux-2.6.17.acpi/drivers/acpi/osl.c
+--- linux-2.6.17/drivers/acpi/osl.c 2006-08-29 11:48:01.000000000 -0400
++++ linux-2.6.17.acpi/drivers/acpi/osl.c 2006-08-29 11:48:45.000000000 -0400
+@@ -43,6 +43,8 @@
#include
#include
@@ -45,7 +46,7 @@
#define _COMPONENT ACPI_OS_SERVICES
ACPI_MODULE_NAME("osl")
-@@ -229,6 +231,79 @@ acpi_os_predefined_override(const struct
+@@ -218,6 +220,79 @@ acpi_os_predefined_override(const struct
return AE_OK;
}
@@ -125,7 +126,7 @@
acpi_status
acpi_os_table_override(struct acpi_table_header * existing_table,
-@@ -237,14 +312,16 @@ acpi_os_table_override(struct acpi_table
+@@ -226,14 +301,16 @@ acpi_os_table_override(struct acpi_table
if (!existing_table || !new_table)
return AE_BAD_PARAMETER;
@@ -147,3 +148,43 @@
return AE_OK;
}
+diff -ruNpX dontdiff linux-2.6.17/init/main.c linux-2.6.17.acpi/init/main.c
+--- linux-2.6.17/init/main.c 2006-08-29 11:48:02.000000000 -0400
++++ linux-2.6.17.acpi/init/main.c 2006-08-29 11:48:45.000000000 -0400
+@@ -613,8 +613,6 @@ asmlinkage void __init start_kernel(void
+
+ check_bugs();
+
+- acpi_early_init(); /* before LAPIC and SMP init */
+-
+ /* Do the rest non-__init'ed, we're now alive */
+ rest_init();
+ }
+@@ -731,6 +729,14 @@ static int init(void * unused)
+ */
+ child_reaper = current;
+
++ /*
++ * Do this before initcalls, because some drivers want to access
++ * firmware files.
++ */
++ populate_rootfs();
++
++ acpi_early_init(); /* before LAPIC and SMP init */
++
+ smp_prepare_cpus(max_cpus);
+
+ do_pre_smp_initcalls();
+@@ -740,12 +746,6 @@ static int init(void * unused)
+
+ cpuset_init_smp();
+
+- /*
+- * Do this before initcalls, because some drivers want to access
+- * firmware files.
+- */
+- populate_rootfs();
+-
+ do_basic_setup();
+
+ /*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/apparmor-mmapexec.patch new/patches.suse/apparmor-mmapexec.patch
--- old/patches.suse/apparmor-mmapexec.patch 2006-06-01 02:36:59.000000000 +0200
+++ new/patches.suse/apparmor-mmapexec.patch 2006-08-30 14:52:41.000000000 +0200
@@ -2,6 +2,7 @@
From: Tony Jones
Subject: Profile access allows essentially execute permission when only read access is granted via usage of mmap system call
References: 175388
+Patch-mainline: no
Add a new 'm' qualifier to indicate executable mapping [mmap(PROT_EXEC)].
This allows policy intent to be maintained across multiple policy revisions
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/apparmor-secureexec.patch new/patches.suse/apparmor-secureexec.patch
--- old/patches.suse/apparmor-secureexec.patch 2006-06-01 02:36:59.000000000 +0200
+++ new/patches.suse/apparmor-secureexec.patch 2006-08-30 14:52:41.000000000 +0200
@@ -2,6 +2,7 @@
From: Tony Jones
Subject: LD_PRELOAD can be exploited to change the execution path across exec transitions
References: 172061
+Patch-mainline: no
Use the LSM secure_exec framework which flags the ELF loader such that libc
scrubs the environment. In addition, two new 'safe' qualifiers U and P are
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/bh-cache-option new/patches.suse/bh-cache-option
--- old/patches.suse/bh-cache-option 2006-06-08 14:36:15.000000000 +0200
+++ new/patches.suse/bh-cache-option 1970-01-01 01:00:00.000000000 +0100
@@ -1,88 +0,0 @@
-From: ak@suse.de
-References: 175797
-Subject: Add option to disable per CPU buffer LRU
-
-It causes real time hickups on large systems.
-
-Index: linux-2.6.16/fs/buffer.c
-===================================================================
---- linux-2.6.16.orig/fs/buffer.c
-+++ linux-2.6.16/fs/buffer.c
-@@ -1339,6 +1339,8 @@ static DEFINE_PER_CPU(struct bh_lru, bh_
- #define bh_lru_unlock() preempt_enable()
- #endif
-
-+static int lru_disabled __read_mostly;
-+
- static inline void check_irqs_on(void)
- {
- #ifdef irqs_disabled
-@@ -1354,6 +1356,9 @@ static void bh_lru_install(struct buffer
- struct buffer_head *evictee = NULL;
- struct bh_lru *lru;
-
-+ if (lru_disabled)
-+ return;
-+
- check_irqs_on();
- bh_lru_lock();
- lru = &__get_cpu_var(bh_lrus);
-@@ -1398,6 +1403,9 @@ lookup_bh_lru(struct block_device *bdev,
- struct bh_lru *lru;
- int i;
-
-+ if (lru_disabled)
-+ return ret;
-+
- check_irqs_on();
- bh_lru_lock();
- lru = &__get_cpu_var(bh_lrus);
-@@ -1519,7 +1527,8 @@ static void invalidate_bh_lru(void *arg)
-
- static void invalidate_bh_lrus(void)
- {
-- on_each_cpu(invalidate_bh_lru, NULL, 1, 1);
-+ if (!lru_disabled)
-+ on_each_cpu(invalidate_bh_lru, NULL, 1, 1);
- }
-
- void set_bh_page(struct buffer_head *bh,
-@@ -3184,6 +3193,9 @@ static void buffer_exit_cpu(int cpu)
- int i;
- struct bh_lru *b = &per_cpu(bh_lrus, cpu);
-
-+ if (lru_disabled)
-+ return;
-+
- for (i = 0; i < BH_LRU_SIZE; i++) {
- brelse(b->bhs[i]);
- b->bhs[i] = NULL;
-@@ -3218,6 +3230,13 @@ void __init buffer_init(void)
- hotcpu_notifier(buffer_cpu_notify, 0);
- }
-
-+static int __init disable_buffer_lru(char *s)
-+{
-+ lru_disabled = 1;
-+ return 0;
-+}
-+__setup("disable_buffer_lru", disable_buffer_lru);
-+
- EXPORT_SYMBOL(__bforget);
- EXPORT_SYMBOL(__brelse);
- EXPORT_SYMBOL(__wait_on_buffer);
-Index: linux-2.6.16/Documentation/kernel-parameters.txt
-===================================================================
---- linux-2.6.16.orig/Documentation/kernel-parameters.txt
-+++ linux-2.6.16/Documentation/kernel-parameters.txt
-@@ -1693,6 +1693,10 @@ running once the system is up.
- norandmaps Don't use address space randomization
- Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space
-
-+ disable_buffer_lru
-+ Disable per CPU LRU in the buffer cache.
-+ This might avoid some real time hickups on large systems.
-+
-
- ______________________________________________________________________
- Changelog:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/connector-read-mostly new/patches.suse/connector-read-mostly
--- old/patches.suse/connector-read-mostly 2006-01-24 21:20:11.000000000 +0100
+++ new/patches.suse/connector-read-mostly 2006-08-29 18:25:50.000000000 +0200
@@ -3,6 +3,8 @@
This will lower the fast path costs of the userland connector code.
+Acked-by: Jeff Mahoney
+
diff -r 61ab85753515 drivers/connector/cn_proc.c
--- a/drivers/connector/cn_proc.c Tue Jan 24 14:14:58 2006 -0500
+++ b/drivers/connector/cn_proc.c Tue Jan 24 14:32:23 2006 -0500
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/cramfs-PageUptodate.patch new/patches.suse/cramfs-PageUptodate.patch
--- old/patches.suse/cramfs-PageUptodate.patch 2006-06-03 11:29:15.000000000 +0200
+++ new/patches.suse/cramfs-PageUptodate.patch 2006-08-30 14:52:41.000000000 +0200
@@ -1,6 +1,6 @@
Subject: cramfs corruption after BLKFLSBUF on loop device
From: Olaf Hering
-References: 175432 - LTC23853
+References: 175432 - LTC23853 , 195509
This script will cause cramfs decompression errors, on SMP at least:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ext2-fsync-err new/patches.suse/ext2-fsync-err
--- old/patches.suse/ext2-fsync-err 2006-08-01 11:07:47.000000000 +0200
+++ new/patches.suse/ext2-fsync-err 2006-08-29 18:25:50.000000000 +0200
@@ -7,6 +7,8 @@
writes that happen through the normal async mechanisms might hit errors without
reporting them back to the application.
+Acked-by: Jeff Mahoney
+
---
fs/ext2/fsync.c | 17 +++++++++++++++++
1 files changed, 17 insertions(+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ext3-barrier-default new/patches.suse/ext3-barrier-default
--- old/patches.suse/ext3-barrier-default 2006-02-06 21:25:39.000000000 +0100
+++ new/patches.suse/ext3-barrier-default 2006-08-29 18:25:50.000000000 +0200
@@ -9,6 +9,8 @@
It should be safe, but some extra review would be appreciated.
+Acked-by: Jeff Mahoney
+
diff -r b1d8075ee99b fs/ext3/fsync.c
--- a/fs/ext3/fsync.c Mon Feb 6 14:42:44 2006 -0500
+++ b/fs/ext3/fsync.c Mon Feb 6 14:43:14 2006 -0500
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/fat-o-flush new/patches.suse/fat-o-flush
--- old/patches.suse/fat-o-flush 2006-08-01 20:10:21.000000000 +0200
+++ new/patches.suse/fat-o-flush 2006-08-29 18:25:50.000000000 +0200
@@ -5,6 +5,8 @@
FS to write things to disk as quickly as possible. It is like -o sync, but
much faster (and not as safe).
+Acked-by: Jeff Mahoney
+
---
fs/fat/file.c | 18 ++++++++++++++++++
fs/fat/inode.c | 9 +++++++--
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/floppy-printk.patch new/patches.suse/floppy-printk.patch
--- old/patches.suse/floppy-printk.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/floppy-printk.patch 2006-08-30 14:40:00.000000000 +0200
@@ -0,0 +1,50 @@
+Subject: [PATCH] exit early in floppy_init when no floppy exists
+From: Olaf Hering
+References: 504 Gateway Time-Out
+
+modprobe -v floppy on a Apple G5 writes incorrect stuff to dmesg:
+
+Floppy drive(s): fd0 is 2.88M
+
+The reason is that the legacy io check happens very late,
+when part of the floppy stuff is already initialized.
+check_legacy_ioport() returns either -ENODEV right away, or it walks
+the device-tree looking for a floppy node.
+
+
+
+Signed-off-by: Olaf Hering
+---
+ drivers/block/floppy.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+Index: linux-2.6.18-rc4/drivers/block/floppy.c
+===================================================================
+--- linux-2.6.18-rc4.orig/drivers/block/floppy.c
++++ linux-2.6.18-rc4/drivers/block/floppy.c
+@@ -4177,6 +4177,11 @@ static int __init floppy_init(void)
+ int i, unit, drive;
+ int err, dr;
+
++#if defined(CONFIG_PPC_MERGE)
++ if (check_legacy_ioport(FDC1))
++ return -ENODEV;
++#endif
++
+ raw_cmd = NULL;
+
+ for (dr = 0; dr < N_DRIVE; dr++) {
+@@ -4234,13 +4239,6 @@ static int __init floppy_init(void)
+ }
+
+ use_virtual_dma = can_use_virtual_dma & 1;
+-#if defined(CONFIG_PPC_MERGE)
+- if (check_legacy_ioport(FDC1)) {
+- del_timer(&fd_timeout);
+- err = -ENODEV;
+- goto out_unreg_region;
+- }
+-#endif
+ fdc_state[0].address = FDC1;
+ if (fdc_state[0].address == -1) {
+ del_timer(&fd_timeout);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/initramfs-before-acpi.patch new/patches.suse/initramfs-before-acpi.patch
--- old/patches.suse/initramfs-before-acpi.patch 2006-08-01 20:10:21.000000000 +0200
+++ new/patches.suse/initramfs-before-acpi.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-Subject: Call populate_rootfs() prior to acpi_early_init()
-From: Hannes Reinecke
-Patch-Mainline: no
-
-populate_rootfs should be called prior to acpi_early_init()
-if we ever want to be able to use a custom DSDT from initramfs.
-Having done this, rootfs is available during acpi_early_init()
-and the ACPI code can just call sys_open() to load a custom
-DSDT.
-
-
- init/main.c | 16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
---- linux-2.6.15.orig/init/main.c 2006-02-10 10:52:10.000000000 -0800
-+++ linux-2.6.15/init/main.c 2006-02-10 10:53:33.000000000 -0800
-@@ -572,8 +572,6 @@
-
- check_bugs();
-
-- acpi_early_init(); /* before LAPIC and SMP init */
--
- /* Do the rest non-__init'ed, we're now alive */
- rest_init();
- }
-@@ -700,6 +698,14 @@
- */
- child_reaper = current;
-
-+ /*
-+ * Do this before initcalls, because some drivers want to access
-+ * firmware files.
-+ */
-+ populate_rootfs();
-+
-+ acpi_early_init(); /* before LAPIC and SMP init */
-+
- smp_prepare_cpus(max_cpus);
-
- do_pre_smp_initcalls();
-@@ -710,12 +716,6 @@
-
- cpuset_init_smp();
-
-- /*
-- * Do this before initcalls, because some drivers want to access
-- * firmware files.
-- */
-- populate_rootfs();
--
- do_basic_setup();
-
- /*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/osync-error new/patches.suse/osync-error
--- old/patches.suse/osync-error 2006-01-15 19:09:15.000000000 +0100
+++ new/patches.suse/osync-error 2006-08-29 18:25:50.000000000 +0200
@@ -5,6 +5,8 @@
Make sure to honor the error status of synchronous writeback during
O_SYNC writes
+Acked-by: Jeff Mahoney
+
Index: linux-2.5/mm/filemap.c===================================================================
RCS file: /home/andrea/crypto/cvs/linux-2.5/mm/filemap.c,v
retrieving revision 1.270
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rcu-remote new/patches.suse/rcu-remote
--- old/patches.suse/rcu-remote 2006-08-01 20:10:21.000000000 +0200
+++ new/patches.suse/rcu-remote 1970-01-01 01:00:00.000000000 +0100
@@ -1,444 +0,0 @@
-From: SGI
-Subject: allow specific cpus to run rcu
-References: 147431
-Patch-mainline: obsolete
-
-Now SN2 specific
-
-Acked-by: mason@suse.com
-
-diff -r b0ad5debd26c include/linux/rcupdate.h
---- a/include/linux/rcupdate.h Sun Jun 04 16:14:21 2006 -0400
-+++ b/include/linux/rcupdate.h Sun Jun 04 16:17:35 2006 -0400
-@@ -108,6 +108,10 @@ struct rcu_data {
- struct rcu_head barrier;
- #ifdef CONFIG_SMP
- long last_rs_qlen; /* qlen during the last resched */
-+#ifdef CONFIG_IA64
-+ spinlock_t rmlock; /* for use with remote callback */
-+ short batch_stat; /* indicate processing being done */
-+#endif
- #endif
- };
-
-@@ -270,6 +274,10 @@ extern void synchronize_rcu(void);
- extern void synchronize_rcu(void);
- void synchronize_idle(void);
- extern void rcu_barrier(void);
-+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64)
-+extern int rcu_set_remote_rcu(int cpu);
-+extern int rcu_clear_remote_rcu(int cpu);
-+#endif
-
- #endif /* __KERNEL__ */
- #endif /* __LINUX_RCUPDATE_H */
-diff -r b0ad5debd26c kernel/rcupdate.c
---- a/kernel/rcupdate.c Sun Jun 04 16:14:21 2006 -0400
-+++ b/kernel/rcupdate.c Sun Jun 04 16:17:35 2006 -0400
-@@ -67,6 +67,8 @@ DEFINE_PER_CPU(struct rcu_data, rcu_bh_d
-
- /* Fake initialization required by compiler */
- static DEFINE_PER_CPU(struct tasklet_struct, rcu_tasklet) = {NULL};
-+/* Tasklet for processing rcu callbacks remotely */
-+static DEFINE_PER_CPU(struct tasklet_struct, rcu_remote_tasklet) = {NULL};
- static int blimit = 10;
- static int qhimark = 10000;
- static int qlowmark = 100;
-@@ -105,6 +107,185 @@ static inline void force_quiescent_state
- }
- #endif
-
-+/*
-+ * Variables and routines for remote rcu callback processing
-+ *
-+ * Remote callback processing allows specified (configured) cpus to have
-+ * their list of rcu callbacks processed by other (non-configured) cpus,
-+ * thus reducing the amount of overhead and latency seen by configured
-+ * cpus.
-+ *
-+ * This is accomplished by having non-configured cpus process the donelist
-+ * of the configured cpus from tasklet context. The remote cpu donelists
-+ * are processed in a round-robin fashion, one list per cpu. Since only
-+ * donelist processing is affected, other rcu list and quiescent state
-+ * processing is unaffected.
-+ *
-+ * Configuration of a cpu for remote callback processing is done via the
-+ * rcu_set_remote_rcu() and rcu_clear_remote_rcu() routines.
-+ */
-+#define RCU_BATCH_IDLE 0
-+#define RCU_BATCH_LOCAL 1
-+#define RCU_BATCH_REMOTE 2
-+
-+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64)
-+#define remote_rcu_callbacks 1
-+
-+/* cpus configured for remote callback processing, this rarely changes */
-+static cpumask_t __read_mostly cpu_remotercu_map = CPU_MASK_NONE;
-+
-+/* next cpu for which we need to do remote callback processing */
-+static int cpu_remotercu_next = -1;
-+
-+/* lock cpu_remotercu_next and changes to cpu_remotercu_map */
-+static DEFINE_SPINLOCK(cpu_remotercu_lock);
-+
-+/*
-+ * Return a mask of online cpus configured for remote rcu processing.
-+ */
-+static void rcu_remote_cpus(cpumask_t * mask)
-+{
-+ cpus_and(*mask, cpu_remotercu_map, cpu_online_map);
-+}
-+
-+/*
-+ * Is this cpu configured for remote rcu callback processing?
-+ */
-+static int rcu_callbacks_processed_remotely(int cpu)
-+{
-+ cpumask_t mask;
-+
-+ rcu_remote_cpus(&mask);
-+ return(cpu_isset(cpu, mask));
-+}
-+
-+/*
-+ * Should this cpu be processing rcu callbacks for cpus configured as such?
-+ */
-+static int rcu_process_remote(int cpu)
-+{
-+ cpumask_t mask;
-+
-+ rcu_remote_cpus(&mask);
-+ /*
-+ * If the system has some cpus configured for remote callbacks and
-+ * this cpu is not one of those, then this cpu processes remote rcu
-+ * callbacks.
-+ */
-+ return (!cpus_empty(mask) && !cpu_isset(cpu, mask));
-+}
-+
-+/*
-+ * Get the next cpu on which to do remote rcu callback processing
-+ * We simply round-robin across all cpus configured for remote callbacks.
-+ */
-+static int rcu_next_remotercu(void)
-+{
-+ cpumask_t mask;
-+ unsigned long flags;
-+ int cpu;
-+
-+ rcu_remote_cpus(&mask);
-+ if (unlikely(cpus_empty(mask)))
-+ return -1;
-+ spin_lock_irqsave(&cpu_remotercu_lock, flags);
-+ cpu_remotercu_next = next_cpu(cpu_remotercu_next, mask);
-+ if (cpu_remotercu_next >= NR_CPUS)
-+ cpu_remotercu_next = first_cpu(mask);
-+ cpu = cpu_remotercu_next;
-+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags);
-+
-+ return cpu;
-+}
-+
-+static void rcu_rm_lock(struct rcu_data *rdp)
-+{
-+ spin_lock_irq(&rdp->rmlock);
-+}
-+
-+static void rcu_rm_unlock(struct rcu_data *rdp)
-+{
-+ spin_unlock_irq(&rdp->rmlock);
-+}
-+
-+static void rcu_set_batch_stat(struct rcu_data *rdp, short stat)
-+{
-+ rdp->batch_stat = stat;
-+}
-+
-+/*
-+ * Update the batch processing status only if no current callback processing.
-+ */
-+static short rcu_setcmp_batch_stat(struct rcu_data *rdp, short stat)
-+{
-+ return cmpxchg(&rdp->batch_stat, RCU_BATCH_IDLE, stat) == RCU_BATCH_IDLE;
-+}
-+
-+/*
-+ * Update qlen and return the new value.
-+ */
-+static long rcu_updated_qlen(struct rcu_data *rdp)
-+{
-+ long old, new;
-+
-+ /* Update qlen safely if configured for remote callbacks */
-+ if (unlikely(rcu_callbacks_processed_remotely(smp_processor_id()))) {
-+ do {
-+ old = rdp->qlen;
-+ new = old + 1;
-+ } while (cmpxchg(&rdp->qlen, old, new) != old);
-+ return new;
-+ } else
-+ return ++rdp->qlen;
-+}
-+
-+/*
-+ * Configure a cpu for remote rcu callback processing.
-+ */
-+int rcu_set_remote_rcu(int cpu)
-+{
-+ unsigned long flags;
-+
-+ if (cpu_online(cpu)) {
-+ spin_lock_irqsave(&cpu_remotercu_lock, flags);
-+ cpu_set(cpu, cpu_remotercu_map);
-+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags);
-+ return 0;
-+ } else
-+ return -1;
-+}
-+EXPORT_SYMBOL_GPL(rcu_set_remote_rcu);
-+
-+/*
-+ * Configure a cpu for standard rcu callback processing.
-+ */
-+int rcu_clear_remote_rcu(int cpu)
-+{
-+ unsigned long flags;
-+
-+ if (cpu_online(cpu)) {
-+ spin_lock_irqsave(&cpu_remotercu_lock, flags);
-+ cpu_clear(cpu, cpu_remotercu_map);
-+ spin_unlock_irqrestore(&cpu_remotercu_lock, flags);
-+ return 0;
-+ } else
-+ return -1;
-+}
-+EXPORT_SYMBOL_GPL(rcu_clear_remote_rcu);
-+#else
-+#define remote_rcu_callbacks 0
-+static int rcu_callbacks_processed_remotely(int cpu) { return 0; }
-+static int rcu_process_remote(int cpu) { return 0; }
-+static void rcu_rm_lock(struct rcu_data *rdp) {}
-+static void rcu_rm_unlock(struct rcu_data *rdp) {}
-+static void rcu_set_batch_stat(struct rcu_data *rdp, short stat) {}
-+static int rcu_setcmp_batch_stat(struct rcu_data *rdp, short stat) { return 1; }
-+static long rcu_updated_qlen(struct rcu_data *rdp)
-+{
-+ return ++rdp->qlen;
-+}
-+static void rcu_clear_remote_rcu(int cpu) {}
-+#endif
- /**
- * call_rcu - Queue an RCU callback for invocation after a grace period.
- * @head: structure to be used for queueing the RCU updates.
-@@ -128,7 +309,7 @@ void fastcall call_rcu(struct rcu_head *
- rdp = &__get_cpu_var(rcu_data);
- *rdp->nxttail = head;
- rdp->nxttail = &head->next;
-- if (unlikely(++rdp->qlen > qhimark)) {
-+ if (unlikely(rcu_updated_qlen(rdp) > qhimark)) {
- rdp->blimit = INT_MAX;
- force_quiescent_state(rdp, &rcu_ctrlblk);
- }
-@@ -164,7 +345,7 @@ void fastcall call_rcu_bh(struct rcu_hea
- *rdp->nxttail = head;
- rdp->nxttail = &head->next;
-
-- if (unlikely(++rdp->qlen > qhimark)) {
-+ if (unlikely(rcu_updated_qlen(rdp) > qhimark)) {
- rdp->blimit = INT_MAX;
- force_quiescent_state(rdp, &rcu_bh_ctrlblk);
- }
-@@ -385,6 +566,8 @@ static void rcu_offline_cpu(int cpu)
- struct rcu_data *this_rdp = &get_cpu_var(rcu_data);
- struct rcu_data *this_bh_rdp = &get_cpu_var(rcu_bh_data);
-
-+ rcu_clear_remote_rcu(cpu);
-+
- __rcu_offline_cpu(this_rdp, &rcu_ctrlblk,
- &per_cpu(rcu_data, cpu));
- __rcu_offline_cpu(this_bh_rdp, &rcu_bh_ctrlblk,
-@@ -392,6 +575,7 @@ static void rcu_offline_cpu(int cpu)
- put_cpu_var(rcu_data);
- put_cpu_var(rcu_bh_data);
- tasklet_kill_immediate(&per_cpu(rcu_tasklet, cpu), cpu);
-+ tasklet_kill_immediate(&per_cpu(rcu_remote_tasklet, cpu), cpu);
- }
-
- #else
-@@ -408,9 +592,26 @@ static void __rcu_process_callbacks(stru
- static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp,
- struct rcu_data *rdp)
- {
-+ int cpu = smp_processor_id();
-+
- if (rdp->curlist && !rcu_batch_before(rcp->completed, rdp->batch)) {
-- *rdp->donetail = rdp->curlist;
-- rdp->donetail = rdp->curtail;
-+ /*
-+ * If this cpu is configured for remote rcu callback
-+ * processing, grab the lock to protect donelist from
-+ * changes done by remote callback processing.
-+ *
-+ * Remote callback processing should only try this lock,
-+ * then move on, so contention should be minimal.
-+ */
-+ if (unlikely(rcu_callbacks_processed_remotely(cpu))) {
-+ rcu_rm_lock(rdp);
-+ *rdp->donetail = rdp->curlist;
-+ rdp->donetail = rdp->curtail;
-+ rcu_rm_unlock(rdp);
-+ } else {
-+ *rdp->donetail = rdp->curlist;
-+ rdp->donetail = rdp->curtail;
-+ }
- rdp->curlist = NULL;
- rdp->curtail = &rdp->curlist;
- }
-@@ -445,8 +646,15 @@ static void __rcu_process_callbacks(stru
- local_irq_enable();
- }
- rcu_check_quiescent_state(rcp, rdp);
-- if (rdp->donelist)
-+ if (remote_rcu_callbacks) {
-+ if (rdp->donelist && !rcu_callbacks_processed_remotely(cpu) &&
-+ rcu_setcmp_batch_stat(rdp, RCU_BATCH_LOCAL)) {
-+ rcu_do_batch(rdp);
-+ rcu_set_batch_stat(rdp, RCU_BATCH_IDLE);
-+ }
-+ } else if (rdp->donelist) {
- rcu_do_batch(rdp);
-+ }
- }
-
- static void rcu_process_callbacks(unsigned long unused)
-@@ -454,6 +662,97 @@ static void rcu_process_callbacks(unsign
- __rcu_process_callbacks(&rcu_ctrlblk, &__get_cpu_var(rcu_data));
- __rcu_process_callbacks(&rcu_bh_ctrlblk, &__get_cpu_var(rcu_bh_data));
- }
-+
-+#if defined(CONFIG_NUMA) && defined(CONFIG_IA64)
-+/*
-+ * Do callback processing for cpus marked as such.
-+ *
-+ * This will only be run on systems with cpus configured for remote
-+ * callback processing, but only on cpus not configured as such.
-+ *
-+ * We process both regular and bh donelists for only one cpu at a
-+ * time.
-+ */
-+static void rcu_process_remote_callbacks(unsigned long unused)
-+{
-+ struct rcu_data *rdp, *rdp_bh;
-+ struct rcu_head * list = NULL;
-+ struct rcu_head * list_bh = NULL;
-+ int cpu;
-+ long old, new, cnt;
-+
-+ /* Get the cpu for which we will process the donelists */
-+ cpu = rcu_next_remotercu();
-+ if (unlikely(cpu == -1))
-+ return;
-+
-+ /*
-+ * We process whatever remote callbacks we can at this moment for
-+ * this cpu. If the list protection locks are held, we move on,
-+ * as we don't want contention.
-+ */
-+ rdp = &per_cpu(rcu_data, cpu);
-+ if (spin_trylock_irq(&rdp->rmlock)) {
-+ /*
-+ * batch_stat ensures cpu isn't still running rcu_do_batch.
-+ * This can happen if we've just configured on the fly.
-+ */
-+ if (rcu_setcmp_batch_stat(rdp, RCU_BATCH_REMOTE)) {
-+ list = xchg(&rdp->donelist, NULL);
-+ if (list != NULL)
-+ rdp->donetail = &rdp->donelist;
-+ }
-+ spin_unlock_irq(&rdp->rmlock);
-+ }
-+
-+ rdp_bh = &per_cpu(rcu_bh_data, cpu);
-+ if (spin_trylock_irq(&rdp_bh->rmlock)) {
-+ if (rcu_setcmp_batch_stat(rdp_bh, RCU_BATCH_REMOTE)) {
-+ list_bh = xchg(&rdp_bh->donelist, NULL);
-+ if (list_bh != NULL)
-+ rdp_bh->donetail = &rdp_bh->donelist;
-+ }
-+ spin_unlock_irq(&rdp_bh->rmlock);
-+ }
-+
-+ /* Process the donelists */
-+ cnt = 0;
-+ while (list) {
-+ list->func(list);
-+ list = list->next;
-+ cnt++;
-+ }
-+
-+ /* Safely update qlen without lock contention */
-+ if (cnt) {
-+ do {
-+ old = rdp->qlen;
-+ new = old - cnt;
-+ } while (cmpxchg(&rdp->qlen, old, new) != old);
-+ }
-+
-+ if (rdp->batch_stat == RCU_BATCH_REMOTE)
-+ rcu_set_batch_stat(rdp, RCU_BATCH_IDLE);
-+
-+ cnt = 0;
-+ while (list_bh) {
-+ list_bh->func(list_bh);
-+ list_bh = list_bh->next;
-+ cnt++;
-+ }
-+
-+ if (cnt) {
-+ do {
-+ old = rdp_bh->qlen;
-+ new = old - cnt;
-+ } while (cmpxchg(&rdp_bh->qlen, old, new)!=old);
-+ }
-+ if (rdp_bh->batch_stat == RCU_BATCH_REMOTE)
-+ rcu_set_batch_stat(rdp_bh, RCU_BATCH_IDLE);
-+}
-+#else
-+static void rcu_process_remote_callbacks(unsigned long unused) {}
-+#endif
-
- static int __rcu_pending(struct rcu_ctrlblk *rcp, struct rcu_data *rdp)
- {
-@@ -486,6 +785,13 @@ static int __rcu_pending(struct rcu_ctrl
- */
- int rcu_pending(int cpu)
- {
-+ /*
-+ * Schedule remote callback processing on this cpu only if
-+ * there are cpus set up for remote callback processing, and
-+ * this one is not.
-+ */
-+ if (unlikely(rcu_process_remote(cpu)))
-+ tasklet_schedule(&per_cpu(rcu_remote_tasklet, cpu));
- return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) ||
- __rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu));
- }
-@@ -527,6 +833,9 @@ static void rcu_init_percpu_data(int cpu
- rdp->qs_pending = 0;
- rdp->cpu = cpu;
- rdp->blimit = blimit;
-+#if defined(CONFIG_SMP) && defined(CONFIG_IA64)
-+ spin_lock_init(&rdp->rmlock);
-+#endif
- }
-
- static void __devinit rcu_online_cpu(int cpu)
-@@ -537,6 +846,8 @@ static void __devinit rcu_online_cpu(int
- rcu_init_percpu_data(cpu, &rcu_ctrlblk, rdp);
- rcu_init_percpu_data(cpu, &rcu_bh_ctrlblk, bh_rdp);
- tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
-+ tasklet_init(&per_cpu(rcu_remote_tasklet, cpu),
-+ rcu_process_remote_callbacks, 0UL);
- }
-
- static int __devinit rcu_cpu_notify(struct notifier_block *self,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rcu-scale new/patches.suse/rcu-scale
--- old/patches.suse/rcu-scale 2006-08-01 11:44:09.000000000 +0200
+++ new/patches.suse/rcu-scale 1970-01-01 01:00:00.000000000 +0100
@@ -1,111 +0,0 @@
-From: SGI
-Subject: slow down rcu processing on big machines
-References: 181202
-Patch-mainline: obsolete
-
-Acked-by: mason@suse.com
-
----
- arch/ia64/sn/kernel/setup.c | 12 ++++++++++++
- include/linux/sysctl.h | 1 +
- kernel/rcupdate.c | 17 +++++++++++++++++
- kernel/sysctl.c | 10 ++++++++++
- 4 files changed, 40 insertions(+)
-
---- linux-2.6.17.orig/arch/ia64/sn/kernel/setup.c
-+++ linux-2.6.17/arch/ia64/sn/kernel/setup.c
-@@ -684,6 +684,18 @@ void __init sn_cpu_init(void)
- (volatile unsigned long *)GLOBAL_MMR_ADDR(nasid,
- SH1_PI_CAM_CONTROL);
- }
-+
-+/*
-+ * This is a hack to fix a RCU scaling problems on insanely large systems. This fix
-+ * is specific to 2.6.16-based kernel.
-+ */
-+ {
-+ extern int rcu_mask;
-+ if (cpuid == 512)
-+ rcu_mask = 1;
-+ else if (cpuid == 768)
-+ rcu_mask = 3;
-+ }
- }
-
- /*
---- linux-2.6.17.orig/include/linux/sysctl.h
-+++ linux-2.6.17/include/linux/sysctl.h
-@@ -149,6 +149,7 @@ enum
- KERN_MAX_LOCK_DEPTH=74,
- KERN_UNSUPPORTED=75, /* int: allow loading of unsupported modules */
- KERN_KDB=76, /* int: kdb on/off */
-+ KERN_RCU_MASK=77, /* int: mask for slow rcu callback processing */
- };
-
-
---- linux-2.6.17.orig/kernel/rcupdate.c
-+++ linux-2.6.17/kernel/rcupdate.c
-@@ -48,6 +48,7 @@
- #include
- #include
- #include
-+#include
-
- /* Definition for rcupdate control block. */
- static struct rcu_ctrlblk rcu_ctrlblk = {
-@@ -66,6 +67,19 @@ static struct rcu_ctrlblk rcu_bh_ctrlblk
- DEFINE_PER_CPU(struct rcu_data, rcu_data) = { 0L };
- DEFINE_PER_CPU(struct rcu_data, rcu_bh_data) = { 0L };
-
-+/*
-+ * Set the following to 1, 3, 7, 15, ... to slow down the rate at which RCU
-+ * callbacks are processed. WARNING - make sure the value is 2**n-1
-+ */
-+int rcu_mask = 0;
-+
-+/* Is it time to process a batch on this cpu */
-+static inline int rcu_time(int cpu)
-+{
-+ return (((jiffies - cpu) & rcu_mask) == 0);
-+}
-+
-+
- /* Fake initialization required by compiler */
- static DEFINE_PER_CPU(struct tasklet_struct, rcu_tasklet) = {NULL};
- /* Tasklet for processing rcu callbacks remotely */
-@@ -821,6 +835,9 @@ int rcu_needs_cpu(int cpu)
-
- void rcu_check_callbacks(int cpu, int user)
- {
-+ if (!rcu_time(cpu))
-+ return;
-+
- if (user ||
- (idle_cpu(cpu) && !in_softirq() &&
- hardirq_count() <= (1 << HARDIRQ_SHIFT))) {
---- linux-2.6.17.orig/kernel/sysctl.c
-+++ linux-2.6.17/kernel/sysctl.c
-@@ -163,6 +163,8 @@ extern ctl_table inotify_table[];
- int sysctl_legacy_va_layout;
- #endif
-
-+extern int rcu_mask;
-+
- /* /proc declarations: */
-
- #ifdef CONFIG_PROC_FS
-@@ -307,6 +309,14 @@ static ctl_table kern_table[] = {
- .mode = 0444,
- .proc_handler = &proc_dointvec,
- },
-+ {
-+ .ctl_name = KERN_RCU_MASK,
-+ .procname = "rcu_mask",
-+ .data = &rcu_mask,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = &proc_dointvec,
-+ },
- #ifdef CONFIG_MODULES
- {
- .ctl_name = KERN_UNSUPPORTED,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-barrier-default new/patches.suse/reiserfs-barrier-default
--- old/patches.suse/reiserfs-barrier-default 2005-07-13 09:04:43.000000000 +0200
+++ new/patches.suse/reiserfs-barrier-default 2006-08-29 18:25:50.000000000 +0200
@@ -6,6 +6,9 @@
fs/reiserfs/super.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
+Acked-by: Jeff Mahoney
+
+
Index: linux-2.6.12/fs/reiserfs/super.c
===================================================================
--- linux-2.6.12.orig/fs/reiserfs/super.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-nobarrier-fsync new/patches.suse/reiserfs-nobarrier-fsync
--- old/patches.suse/reiserfs-nobarrier-fsync 2005-07-13 09:04:43.000000000 +0200
+++ new/patches.suse/reiserfs-nobarrier-fsync 2006-08-29 18:25:50.000000000 +0200
@@ -4,6 +4,8 @@
make sure that reiserfs_fsync only triggers barriers when mounted with
-o barrier=flush
+Acked-by: Jeff Mahoney
+
fs/reiserfs/file.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-periodic-flush-latency new/patches.suse/reiserfs-periodic-flush-latency
--- old/patches.suse/reiserfs-periodic-flush-latency 2006-05-08 04:25:53.000000000 +0200
+++ new/patches.suse/reiserfs-periodic-flush-latency 2006-08-29 18:25:50.000000000 +0200
@@ -13,6 +13,8 @@
if a bad decision is made, it just means a slightly longer journal
replay after a crash.
+Acked-by: Jeff Mahoney
+
diff -r f5fbf9aa254c fs/reiserfs/journal.c
--- a/fs/reiserfs/journal.c Fri Apr 14 13:10:47 2006 -0400
+++ b/fs/reiserfs/journal.c Sun May 07 22:07:38 2006 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/shmall-bigger new/patches.suse/shmall-bigger
--- old/patches.suse/shmall-bigger 2006-02-12 02:25:58.000000000 +0100
+++ new/patches.suse/shmall-bigger 2006-08-29 18:25:50.000000000 +0200
@@ -4,6 +4,8 @@
The defaults are too small for most users.
+Acked-by: Jeff Mahoney
+
diff -r bc44f8e6757b include/linux/msg.h
--- a/include/linux/msg.h Sat Feb 11 12:48:44 2006 -0500
+++ b/include/linux/msg.h Sat Feb 11 20:10:10 2006 -0500
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch new/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
--- old/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch 2005-11-25 14:35:54.000000000 +0100
+++ new/patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-Subject: [PATCH] Fix pmac_zilog as console
-From: Benjamin Herrenschmidt
-
-http://linux.bkbits.net:8080/linux-2.6/gnupatch@418eeaabEopKEhWRlJFrp5KeVLAt...
-...
-By default, BREAK is used for sysrq, though some
-Apple zilog's seem to have non-working BREAK detection logic, thus the
-driver has a #define option you can manually enable when debugging to do
-SYSRQ with ctrl-O instead (like pSeries virtual consoles).
-...
-
-Signed-off-by: Olaf Hering
-
- drivers/serial/pmac_zilog.c | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.15-rc2-olh/drivers/serial/pmac_zilog.c
-===================================================================
---- linux-2.6.15-rc2-olh.orig/drivers/serial/pmac_zilog.c
-+++ linux-2.6.15-rc2-olh/drivers/serial/pmac_zilog.c
-@@ -40,7 +40,7 @@
-
- #undef DEBUG
- #undef DEBUG_HARD
--#undef USE_CTRL_O_SYSRQ
-+#define USE_CTRL_O_SYSRQ
-
- #include
- #include
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-08-28 22:45:29.000000000 +0200
+++ kernel-source/series.conf 2006-08-30 14:50:48.000000000 +0200
@@ -26,8 +26,9 @@
patches.kernel.org/patch-2.6.18-rc3-rc4
patches.kernel.org/patch-2.6.18-rc4-rc5
+ patches.arch/ppc-update_gtod-race.patch
+
patches.fixes/setuid-dumpable-wrongdir
-# patches.fixes/kbuild-fix-external-module
########################################################
#
@@ -40,7 +41,6 @@
patches.rpmify/rpm-kernel-config
patches.rpmify/buildhost
patches.rpmify/cloneconfig.diff
-# patches.rpmify/suse-extmod-legacy ???
patches.rpmify/build-timestamp
# every patch below is optional
@@ -59,8 +59,6 @@
# ia64
patches.arch/stack-limit
- patches.arch/ia64-export-node-to-cpu-mask.patch
- patches.fixes/ia64-put-user-size
# i386
patches.arch/i386-apic-auto
@@ -69,7 +67,6 @@
# 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T'
# x64
# "the architecture with too many names"
- patches.arch/x86_64-nmi-watchdog-timeout
# for i386/x86-64
@@ -79,7 +76,6 @@
patches.suse/suse-ppc-legacy-io.patch
patches.arch/ppc-tumbler-active_state.patch
patches.suse/mv643xx_eth.hwinfo.patch
- patches.suse/suse-ppc-pmac_zilog.USE_CTRL_O_SYSRQ.patch
patches.suse/suse-ppc32-mol.patch
patches.suse/suse-ppc32-mol-kbuild.patch
patches.suse/suse-ppc32-mol-mm-context
@@ -89,9 +85,7 @@
patches.suse/suse-ppc64-branding
patches.arch/ppc64-xmon-autobacktrace.patch
patches.arch/ppc64-xmon-dmesg-printing.patch
- patches.arch/ppc-kdump-shutdown-interrupts.patch
patches.arch/ppc-kdump-xmon-stop-cpu.patch
- patches.arch/ppc-kdump-disable-eeh-and-numa.patch
patches.fixes/ignore-aix-disk-label.patch
# KDB v4.4
@@ -117,9 +111,7 @@
# ACPI patches
#
########################################################
- patches.suse/initramfs-before-acpi.patch
patches.suse/acpi_dsdt_initrd_initramfs
- patches.suse/acpi-oldboot
patches.arch/acpi_export_syms
# Specific support for vendor-specific features
@@ -183,10 +175,8 @@
patches.suse/lockd-suse-config
########################################################
- # cifs and smbfs patches
+ # cifs patches
########################################################
- patches.drivers/smbfs-sendqueue-backoff
- patches.drivers/smbfs-request-counting
########################################################
# ext3
@@ -229,7 +219,6 @@
########################################################
# Networking, IPv6
########################################################
- patches.fixes/ipv6-init-fail-cleanup
patches.fixes/ipv6-add-addr-install-dstentry
patches.fixes/ipv6-no-autoconf
@@ -254,6 +243,7 @@
########################################################
# Storage
########################################################
+ patches.suse/floppy-printk.patch
# Remaining SCSI patches (garloff)
patches.suse/scsi-scan-inq-ppc64-dflt
patches.suse/scsi-error-test-unit-ready-timeout
@@ -262,7 +252,6 @@
# Network
########################################################
patches.fixes/tulip-quad-NIC-ifdown
- patches.fixes/tulip-down-race
patches.suse/prism-defaultmac
patches.suse/nameif-track-rename.patch
patches.suse/rtnetlink-atomic2.patch
@@ -321,7 +310,6 @@
# patches.drivers/libata-acpi-suspend
# patches.drivers/libata-acpi-suspend-doc-fix
patches.fixes/dm-suspend-resume-events
- patches.fixes/libata-increase-timeout-for-resume
########################################################
@@ -332,8 +320,6 @@
# Patches for S/390 from SUSE which don't rely on IBM's
# patches:
########################################################
- # Enable RAW devices
- patches.arch/s390-raw-device
# bootsplash -- now duwe's job
patches.suse/bootsplash
@@ -411,8 +397,6 @@
patches.suse/readahead-tune
patches.suse/ide-probe-delay
- patches.drivers/sis5513-support-sis-965l
-
patches.suse/osync-error
patches.suse/connector-read-mostly
@@ -421,10 +405,6 @@
patches.suse/shmall-bigger
patches.fixes/grab-swap-token-oops
- patches.suse/rcu-remote
-
- # still need?
-# patches.fixes/nfsd-setuser-fix
patches.arch/disable-apic-error
patches.fixes/dm_check_device_area.diff
@@ -439,13 +419,10 @@
patches.fixes/nfsd-dmapi-aware
patches.suse/smtnice-disable
- patches.suse/rcu-scale
patches.suse/filp-slab-rcu
patches.suse/ext2-fsync-err
patches.fixes/remount-no-shrink-dcache
- patches.suse/bh-cache-option
patches.suse/sysctl-add-affinity_load_balancing
- patches.fixes/nfsv4-setclientid
patches.fixes/ipmi-unload-crash
patches.fixes/loop-barriers
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org