Hello community,
here is the log from the commit of package kernel-source
checked in at Thu May 25 01:18:06 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-05-19 17:51:35.000000000 +0200
+++ kernel-source/kernel-bigsmp.changes 2006-05-24 18:54:22.000000000 +0200
@@ -1,0 +2,141 @@
+Wed May 24 13:13:52 CEST 2006 - agruen@suse.de
+
+- Fix the logic that detects when to build a debug package so that
+ it works in the OpenSUSE build service.
+
+-------------------------------------------------------------------
+Tue May 23 23:44:54 CEST 2006 - kkeil@suse.de
+
+- patches.drivers/b44-fix_mac_address: b44: fix force mac address
+ before ifconfig up (169703).
+
+-------------------------------------------------------------------
+Tue May 23 15:47:03 CEST 2006 - gregkh@suse.de
+
+- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones)
+ - fs/compat.c: fix 'if (a |= b )' typo
+ - smbus unhiding kills thermal management
+ - PCI quirk: VIA IRQ fixup should only run for VIA southbridges
+ - VIA quirk fixup, additional PCI IDs
+ - Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039)
+ - Remove cond_resched in gather_stats()
+ - page migration: Fix fallback behavior for dirty pages
+ - via-rhine: zero pad short packets on Rhine I ethernet cards
+ - Fix udev device creation
+ - smbfs: Fix slab corruption in samba error path
+ - scx200_acb: Fix resource name use after free
+ - limit request_fn recursion
+ - TG3: ethtool always report port is TP.
+ - PCI: correctly allocate return buffers for osc calls
+ - add migratepage address space op to shmem
+ - Fix ptrace_attach()/ptrace_traceme()/de_thread() race
+ - ptrace_attach: fix possible deadlock schenario with irqs
+ - md: Avoid oops when attempting to fix read errors on raid10
+ - NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
+ - USB: ub oops in block_uevent
+ - selinux: check for failed kmalloc in security_sid_to_context()
+ - fs/locks.c: Fix sys_flock() race
+ - SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858)
+ - SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857)
+
+- patches.drivers/altix-correct-ioc3-port-order.patch: Altix:
+ correct ioc3 port order (176896).
+- patches.drivers/altix-correct-ioc4-port-order.patch: Altix:
+ correct ioc4 port order (176896).
+
+-------------------------------------------------------------------
+Tue May 23 18:05:20 CEST 2006 - trenn@suse.de
+
+- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch:
+ Fix for apic initialization bug using kdump (177741).
+
+-------------------------------------------------------------------
+Tue May 23 17:46:10 CEST 2006 - perex@suse.de
+
+- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for
+ bonding (might_sleep) (174843).
+
+-------------------------------------------------------------------
+Tue May 23 17:38:05 CEST 2006 - schwab@suse.de
+
+- iosapic-move-irq: fix broken irq affinity [#176697].
+
+-------------------------------------------------------------------
+Tue May 23 16:11:35 CEST 2006 - ak@suse.de
+
+- patches.arch/x86_64-bad-addr-boundary: Fix off by one in
+ bad_addr checking in find_e820_area (166022).
+
+-------------------------------------------------------------------
+Tue May 23 14:39:34 CEST 2006 - hare@suse.de
+
+- patches.drivers/aic79xx-remove-slave-alloc: Remove
+ slave_alloc() to avoid refcounting problems (#96728)
+
+-------------------------------------------------------------------
+Mon May 22 17:25:04 CEST 2006 - trenn@suse.de
+
+- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver
+ unconditionally (kernel #6111).
+
+-------------------------------------------------------------------
+Mon May 22 16:36:15 CEST 2006 - hare@suse.de
+
+- patches.fixes/sd-fix-unknown-size
+ Return '0' for unknown disk sizes (#176780 - LTC23895)
+
+-------------------------------------------------------------------
+Mon May 22 15:17:11 CEST 2006 - hare@suse.de
+
+- patches.fixes/fusion-fix-kdump-drvinit
+ Fix LSI Fusion initialisation after kdump (#173275 - LTC23573)
+
+-------------------------------------------------------------------
+Mon May 22 13:03:13 CEST 2006 - hare@suse.de
+
+- patches.drivers/open-iscsi-svn.diff
+ Update to svn r584 to really fix machine lockups (#176151)
+- patches.drivers/mptfc-sles10-update
+ Fix several issues with the LSI Fusion FC driver (#173664)
+
+-------------------------------------------------------------------
+Mon May 22 09:17:50 CEST 2006 - hare@suse.de
+
+- patches.arch/s390-zfcp-statistics.diff
+- patches.arch/s390-zfcp-statistic-disclaimer.diff
+ Re-add zfcp statistics.
+- Update config files.
+
+-------------------------------------------------------------------
+Sat May 20 02:38:49 CEST 2006 - ak@suse.de
+
+- patches.suse/tcp-proc-listen: Fix deadlock
+
+-------------------------------------------------------------------
+Fri May 19 20:54:39 CEST 2006 - gregkh@suse.de
+
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs (175786).
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support (175786).
+
+-------------------------------------------------------------------
+Fri May 19 20:54:14 CEST 2006 - gregkh@suse.de
+
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs.
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support.
+
+-------------------------------------------------------------------
+Fri May 19 20:28:57 CEST 2006 - gregkh@suse.de
+
+- patches.fixes/add-migratepage-address-space-op-to-shmem.patch:
+ [PATCH] add migratepage address space op to shmem (176147).
+- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch:
+ [PATCH] page migration: Fix fallback behavior for dirty pages
+ (176147).
+- patches.fixes/remove-cond_resched-in-gather_stats.patch:
+ [PATCH] Remove cond_resched in gather_stats() (176147).
+
+-------------------------------------------------------------------
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-smp.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.zPHcNc/_old 2006-05-25 00:57:33.000000000 +0200
+++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.16.16)
+# spec file for package kernel-bigsmp (Version 2.6.16.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.16
-Release: 2
+Version: 2.6.16.18
+Release: 1
Summary: Kernel with Multiprocessor Support and PAE
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.16-%release
+Provides: kernel = 2.6.16.18-%release
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -97,8 +97,6 @@
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
-# Are we building with debug symbols enabled?
-%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? )
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 8 or 15;
# see scripts/kabi-checks)
@@ -113,12 +111,12 @@
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.16.16.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.16.src.rpm."
+ echo "The kernel-bigsmp-2.6.16.18.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.18.src.rpm."
exit 1
fi
symbols=$(
@@ -181,7 +179,7 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
-%if %with_debug
+%if %{defined __debug_package}
cat >> ../.rpm-defs <
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%install
@@ -40,6 +40,95 @@
/etc/dummy
%changelog -n kernel-dummy
+* Wed May 24 2006 - agruen@suse.de
+- Fix the logic that detects when to build a debug package so that
+ it works in the OpenSUSE build service.
+* Tue May 23 2006 - kkeil@suse.de
+- patches.drivers/b44-fix_mac_address: b44: fix force mac address
+ before ifconfig up (169703).
+* Tue May 23 2006 - trenn@suse.de
+- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch:
+ Fix for apic initialization bug using kdump (177741).
+* Tue May 23 2006 - perex@suse.de
+- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for
+ bonding (might_sleep) (174843).
+* Tue May 23 2006 - schwab@suse.de
+- iosapic-move-irq: fix broken irq affinity [#176697].
+* Tue May 23 2006 - ak@suse.de
+- patches.arch/x86_64-bad-addr-boundary: Fix off by one in
+ bad_addr checking in find_e820_area (166022).
+* Tue May 23 2006 - gregkh@suse.de
+- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones)
+- fs/compat.c: fix 'if (a |= b )' typo
+- smbus unhiding kills thermal management
+- PCI quirk: VIA IRQ fixup should only run for VIA southbridges
+- VIA quirk fixup, additional PCI IDs
+- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039)
+- Remove cond_resched in gather_stats()
+- page migration: Fix fallback behavior for dirty pages
+- via-rhine: zero pad short packets on Rhine I ethernet cards
+- Fix udev device creation
+- smbfs: Fix slab corruption in samba error path
+- scx200_acb: Fix resource name use after free
+- limit request_fn recursion
+- TG3: ethtool always report port is TP.
+- PCI: correctly allocate return buffers for osc calls
+- add migratepage address space op to shmem
+- Fix ptrace_attach()/ptrace_traceme()/de_thread() race
+- ptrace_attach: fix possible deadlock schenario with irqs
+- md: Avoid oops when attempting to fix read errors on raid10
+- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
+- USB: ub oops in block_uevent
+- selinux: check for failed kmalloc in security_sid_to_context()
+- fs/locks.c: Fix sys_flock() race
+- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858)
+- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857)
+- patches.drivers/altix-correct-ioc3-port-order.patch: Altix:
+ correct ioc3 port order (176896).
+- patches.drivers/altix-correct-ioc4-port-order.patch: Altix:
+ correct ioc4 port order (176896).
+* Tue May 23 2006 - hare@suse.de
+- patches.drivers/aic79xx-remove-slave-alloc: Remove
+ slave_alloc() to avoid refcounting problems (#96728)
+* Mon May 22 2006 - trenn@suse.de
+- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver
+ unconditionally (kernel #6111).
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/sd-fix-unknown-size
+ Return '0' for unknown disk sizes (#176780 - LTC23895)
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/fusion-fix-kdump-drvinit
+ Fix LSI Fusion initialisation after kdump (#173275 - LTC23573)
+* Mon May 22 2006 - hare@suse.de
+- patches.drivers/open-iscsi-svn.diff
+ Update to svn r584 to really fix machine lockups (#176151)
+- patches.drivers/mptfc-sles10-update
+ Fix several issues with the LSI Fusion FC driver (#173664)
+* Mon May 22 2006 - hare@suse.de
+- patches.arch/s390-zfcp-statistics.diff
+- patches.arch/s390-zfcp-statistic-disclaimer.diff
+ Re-add zfcp statistics.
+- Update config files.
+* Sat May 20 2006 - ak@suse.de
+- patches.suse/tcp-proc-listen: Fix deadlock
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs (175786).
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support (175786).
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs.
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support.
+* Fri May 19 2006 - gregkh@suse.de
+- patches.fixes/add-migratepage-address-space-op-to-shmem.patch:
+ [PATCH] add migratepage address space op to shmem (176147).
+- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch:
+ [PATCH] page migration: Fix fallback behavior for dirty pages
+ (176147).
+- patches.fixes/remove-cond_resched-in-gather_stats.patch:
+ [PATCH] Remove cond_resched in gather_stats() (176147).
* Fri May 19 2006 - kraxel@suse.de
- patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header
is 14 not 16 bytes (150410).
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200
+++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.16.16)
+# spec file for package kernel-iseries64 (Version 2.6.16.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.16
-Release: 2
+Version: 2.6.16.18
+Release: 1
Summary: 64-Bit Kernel for iSeries
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.16-%release
+Provides: kernel = 2.6.16.18-%release
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -100,8 +100,6 @@
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
-# Are we building with debug symbols enabled?
-%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? )
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 8 or 15;
# see scripts/kabi-checks)
@@ -114,12 +112,12 @@
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.16.16.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.16.src.rpm."
+ echo "The kernel-iseries64-2.6.16.18.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.18.src.rpm."
exit 1
fi
symbols=$(
@@ -182,7 +180,7 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
-%if %with_debug
+%if %{defined __debug_package}
cat >> ../.rpm-defs <
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.16.16.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.16.src.rpm."
+ echo "The kernel-ppc64-2.6.16.18.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.18.src.rpm."
exit 1
fi
symbols=$(
@@ -196,7 +194,7 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
-%if %with_debug
+%if %{defined __debug_package}
cat >> ../.rpm-defs <> ../.rpm-defs <http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2
Source1: functions.sh
Source2: source-post.sh
@@ -93,7 +93,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
@@ -116,16 +116,16 @@
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.16.16/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.16.16/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.16/$patch; then
+ > %_builddir/kernel-source-2.6.16.18/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.16.18/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.18/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.16 %release
-KERNELRELEASE=2.6.16.16-%release
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.18 %release
+KERNELRELEASE=2.6.16.18-%release
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.16.16/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.16.16/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.16.18/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.16.18/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -274,6 +274,95 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Wed May 24 2006 - agruen@suse.de
+- Fix the logic that detects when to build a debug package so that
+ it works in the OpenSUSE build service.
+* Tue May 23 2006 - kkeil@suse.de
+- patches.drivers/b44-fix_mac_address: b44: fix force mac address
+ before ifconfig up (169703).
+* Tue May 23 2006 - trenn@suse.de
+- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch:
+ Fix for apic initialization bug using kdump (177741).
+* Tue May 23 2006 - perex@suse.de
+- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for
+ bonding (might_sleep) (174843).
+* Tue May 23 2006 - schwab@suse.de
+- iosapic-move-irq: fix broken irq affinity [#176697].
+* Tue May 23 2006 - ak@suse.de
+- patches.arch/x86_64-bad-addr-boundary: Fix off by one in
+ bad_addr checking in find_e820_area (166022).
+* Tue May 23 2006 - gregkh@suse.de
+- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones)
+- fs/compat.c: fix 'if (a |= b )' typo
+- smbus unhiding kills thermal management
+- PCI quirk: VIA IRQ fixup should only run for VIA southbridges
+- VIA quirk fixup, additional PCI IDs
+- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039)
+- Remove cond_resched in gather_stats()
+- page migration: Fix fallback behavior for dirty pages
+- via-rhine: zero pad short packets on Rhine I ethernet cards
+- Fix udev device creation
+- smbfs: Fix slab corruption in samba error path
+- scx200_acb: Fix resource name use after free
+- limit request_fn recursion
+- TG3: ethtool always report port is TP.
+- PCI: correctly allocate return buffers for osc calls
+- add migratepage address space op to shmem
+- Fix ptrace_attach()/ptrace_traceme()/de_thread() race
+- ptrace_attach: fix possible deadlock schenario with irqs
+- md: Avoid oops when attempting to fix read errors on raid10
+- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
+- USB: ub oops in block_uevent
+- selinux: check for failed kmalloc in security_sid_to_context()
+- fs/locks.c: Fix sys_flock() race
+- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858)
+- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857)
+- patches.drivers/altix-correct-ioc3-port-order.patch: Altix:
+ correct ioc3 port order (176896).
+- patches.drivers/altix-correct-ioc4-port-order.patch: Altix:
+ correct ioc4 port order (176896).
+* Tue May 23 2006 - hare@suse.de
+- patches.drivers/aic79xx-remove-slave-alloc: Remove
+ slave_alloc() to avoid refcounting problems (#96728)
+* Mon May 22 2006 - trenn@suse.de
+- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver
+ unconditionally (kernel #6111).
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/sd-fix-unknown-size
+ Return '0' for unknown disk sizes (#176780 - LTC23895)
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/fusion-fix-kdump-drvinit
+ Fix LSI Fusion initialisation after kdump (#173275 - LTC23573)
+* Mon May 22 2006 - hare@suse.de
+- patches.drivers/open-iscsi-svn.diff
+ Update to svn r584 to really fix machine lockups (#176151)
+- patches.drivers/mptfc-sles10-update
+ Fix several issues with the LSI Fusion FC driver (#173664)
+* Mon May 22 2006 - hare@suse.de
+- patches.arch/s390-zfcp-statistics.diff
+- patches.arch/s390-zfcp-statistic-disclaimer.diff
+ Re-add zfcp statistics.
+- Update config files.
+* Sat May 20 2006 - ak@suse.de
+- patches.suse/tcp-proc-listen: Fix deadlock
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs (175786).
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support (175786).
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs.
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support.
+* Fri May 19 2006 - gregkh@suse.de
+- patches.fixes/add-migratepage-address-space-op-to-shmem.patch:
+ [PATCH] add migratepage address space op to shmem (176147).
+- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch:
+ [PATCH] page migration: Fix fallback behavior for dirty pages
+ (176147).
+- patches.fixes/remove-cond_resched-in-gather_stats.patch:
+ [PATCH] Remove cond_resched in gather_stats() (176147).
* Fri May 19 2006 - kraxel@suse.de
- patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header
is 14 not 16 bytes (150410).
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:34.000000000 +0200
+++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:34.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.16.16)
+# spec file for package kernel-syms (Version 2.6.16.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -48,10 +48,10 @@
Autoreqprov: off
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
-Version: 2.6.16.16
-Release: 2
+Version: 2.6.16.18
+Release: 1
Requires: linux
-Requires: kernel-source = 2.6.16.16-%release
+Requires: kernel-source = 2.6.16.18-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%install
@@ -127,6 +127,95 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Wed May 24 2006 - agruen@suse.de
+- Fix the logic that detects when to build a debug package so that
+ it works in the OpenSUSE build service.
+* Tue May 23 2006 - kkeil@suse.de
+- patches.drivers/b44-fix_mac_address: b44: fix force mac address
+ before ifconfig up (169703).
+* Tue May 23 2006 - trenn@suse.de
+- patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch:
+ Fix for apic initialization bug using kdump (177741).
+* Tue May 23 2006 - perex@suse.de
+- patches.suse/rtnetlink-atomic2.patch: Fix debug traces for
+ bonding (might_sleep) (174843).
+* Tue May 23 2006 - schwab@suse.de
+- iosapic-move-irq: fix broken irq affinity [#176697].
+* Tue May 23 2006 - ak@suse.de
+- patches.arch/x86_64-bad-addr-boundary: Fix off by one in
+ bad_addr checking in find_e820_area (166022).
+* Tue May 23 2006 - gregkh@suse.de
+- Update to 2.6.16.18 (lots of bugfixes and security updates, public and non-public ones)
+- fs/compat.c: fix 'if (a |= b )' typo
+- smbus unhiding kills thermal management
+- PCI quirk: VIA IRQ fixup should only run for VIA southbridges
+- VIA quirk fixup, additional PCI IDs
+- Netfilter: do_add_counters race, possible oops or info leak (CVE-2006-0039)
+- Remove cond_resched in gather_stats()
+- page migration: Fix fallback behavior for dirty pages
+- via-rhine: zero pad short packets on Rhine I ethernet cards
+- Fix udev device creation
+- smbfs: Fix slab corruption in samba error path
+- scx200_acb: Fix resource name use after free
+- limit request_fn recursion
+- TG3: ethtool always report port is TP.
+- PCI: correctly allocate return buffers for osc calls
+- add migratepage address space op to shmem
+- Fix ptrace_attach()/ptrace_traceme()/de_thread() race
+- ptrace_attach: fix possible deadlock schenario with irqs
+- md: Avoid oops when attempting to fix read errors on raid10
+- NETFILTER: SNMP NAT: fix memory corruption (CVE-2006-2444)
+- USB: ub oops in block_uevent
+- selinux: check for failed kmalloc in security_sid_to_context()
+- fs/locks.c: Fix sys_flock() race
+- SCTP: Respect the real chunk length when walking parameters (CVE-2006-1858)
+- SCTP: Validate the parameter length in HB-ACK chunk (CVE-2006-1857)
+- patches.drivers/altix-correct-ioc3-port-order.patch: Altix:
+ correct ioc3 port order (176896).
+- patches.drivers/altix-correct-ioc4-port-order.patch: Altix:
+ correct ioc4 port order (176896).
+* Tue May 23 2006 - hare@suse.de
+- patches.drivers/aic79xx-remove-slave-alloc: Remove
+ slave_alloc() to avoid refcounting problems (#96728)
+* Mon May 22 2006 - trenn@suse.de
+- patches.fixes/acpi_ec_dummy.patch: Remove fake EC driver
+ unconditionally (kernel #6111).
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/sd-fix-unknown-size
+ Return '0' for unknown disk sizes (#176780 - LTC23895)
+* Mon May 22 2006 - hare@suse.de
+- patches.fixes/fusion-fix-kdump-drvinit
+ Fix LSI Fusion initialisation after kdump (#173275 - LTC23573)
+* Mon May 22 2006 - hare@suse.de
+- patches.drivers/open-iscsi-svn.diff
+ Update to svn r584 to really fix machine lockups (#176151)
+- patches.drivers/mptfc-sles10-update
+ Fix several issues with the LSI Fusion FC driver (#173664)
+* Mon May 22 2006 - hare@suse.de
+- patches.arch/s390-zfcp-statistics.diff
+- patches.arch/s390-zfcp-statistic-disclaimer.diff
+ Re-add zfcp statistics.
+- Update config files.
+* Sat May 20 2006 - ak@suse.de
+- patches.suse/tcp-proc-listen: Fix deadlock
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs (175786).
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support (175786).
+* Fri May 19 2006 - gregkh@suse.de
+- patches.drivers/ati-sb600-ahci-support.patch: [PATCH] [libata]
+ ahci: add ATI SB600 PCI IDs.
+- patches.drivers/ati-sb600-ide-support.patch: [PATCH] ide:
+ ATI SB600 IDE support.
+* Fri May 19 2006 - gregkh@suse.de
+- patches.fixes/add-migratepage-address-space-op-to-shmem.patch:
+ [PATCH] add migratepage address space op to shmem (176147).
+- patches.fixes/page-migration-Fix-fallback-behavior-for-dirty-pages.patch:
+ [PATCH] page migration: Fix fallback behavior for dirty pages
+ (176147).
+- patches.fixes/remove-cond_resched-in-gather_stats.patch:
+ [PATCH] Remove cond_resched in gather_stats() (176147).
* Fri May 19 2006 - kraxel@suse.de
- patches.fixes/nf_bridge-header-size: nf_bridge: ethernet header
is 14 not 16 bytes (150410).
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.zPHcNc/_old 2006-05-25 00:57:35.000000000 +0200
+++ /var/tmp/diff_new_pack.zPHcNc/_new 2006-05-25 00:57:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.16.16)
+# spec file for package kernel-um (Version 2.6.16.18)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.16
-Release: 2
+Version: 2.6.16.18
+Release: 1
Summary: The User Mode Linux kernel.
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.16-%release
+Provides: kernel = 2.6.16.18-%release
%endif
%endif
Provides: kernel-um-nongpl
@@ -97,8 +97,6 @@
%define __find_provides %_sourcedir/find-provides %name
# Will modules not listed in supported.conf abort the kernel build (0/1)?
%define supported_modules_check 0
-# Are we building with debug symbols enabled?
-%define with_debug %(set -- " %optflags "; [ "$1" = "${1/ -g }" ]; echo $? )
%define tolerate_unknown_new_config_options 0
# kABI change tolerance (default in maintenance should be 4, 8 or 15;
# see scripts/kabi-checks)
@@ -114,12 +112,12 @@
-Source Timestamp: 2006/05/19 14:42:27 UTC
+Source Timestamp: 2006/05/24 16:52:45 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-um-2.6.16.16.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.16.src.rpm."
+ echo "The kernel-um-2.6.16.18.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.18.src.rpm."
exit 1
fi
symbols=$(
@@ -182,7 +180,7 @@
MAKE_ARGS="ARCH=$subarch"
EOF
%endif
-%if %with_debug
+%if %{defined __debug_package}
cat >> ../.rpm-defs <
+Subject: Remove fake EC driver unconditionally
+Patch-mainline: yes
+References: kernel #6111
+
+acpi-ecdt-uid-hack
+On some boxes ecdt uid may be equal to 0, so do not test for uids equality, so
+that fake handler will be unconditionally removed to allow loading the real one.
+
+Signed-off-by: Jiri Slaby
+Signed-off-by: Thomas Renninger
+
+ drivers/acpi/ec.c | 16 ++++++----------
+ 1 files changed, 6 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
+index f339bd4..de95a09 100644
+
+
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -989,7 +989,6 @@ static int acpi_ec_poll_add(struct acpi_
+ int result = 0;
+ acpi_status status = AE_OK;
+ union acpi_ec *ec = NULL;
+- unsigned long uid;
+
+ ACPI_FUNCTION_TRACE("acpi_ec_add");
+
+@@ -1012,10 +1011,9 @@ static int acpi_ec_poll_add(struct acpi_
+ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
+ &ec->common.global_lock);
+
+- /* If our UID matches the UID for the ECDT-enumerated EC,
+- we now have the *real* EC info, so kill the makeshift one. */
+- acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+- if (ec_ecdt && ec_ecdt->common.uid == uid) {
++ /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see:
++ http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
++ if (ec_ecdt) {
+ acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
+ ACPI_ADR_SPACE_EC,
+ &acpi_ec_space_handler);
+@@ -1059,7 +1057,6 @@ static int acpi_ec_intr_add(struct acpi_
+ int result = 0;
+ acpi_status status = AE_OK;
+ union acpi_ec *ec = NULL;
+- unsigned long uid;
+
+ ACPI_FUNCTION_TRACE("acpi_ec_add");
+
+@@ -1085,10 +1082,9 @@ static int acpi_ec_intr_add(struct acpi_
+ acpi_evaluate_integer(ec->common.handle, "_GLK", NULL,
+ &ec->common.global_lock);
+
+- /* If our UID matches the UID for the ECDT-enumerated EC,
+- we now have the *real* EC info, so kill the makeshift one. */
+- acpi_evaluate_integer(ec->common.handle, "_UID", NULL, &uid);
+- if (ec_ecdt && ec_ecdt->common.uid == uid) {
++ /* XXX we doesn't test uids, because on some boxes ecdt uid = 0, see:
++ http://bugzilla.kernel.org/show_bug.cgi?id=6111 */
++ if (ec_ecdt) {
+ acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
+ ACPI_ADR_SPACE_EC,
+ &acpi_ec_space_handler);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/blk-limit-recursion new/patches.fixes/blk-limit-recursion
--- old/patches.fixes/blk-limit-recursion 2006-05-03 13:44:40.000000000 +0200
+++ new/patches.fixes/blk-limit-recursion 1970-01-01 01:00:00.000000000 +0100
@@ -1,72 +0,0 @@
-From: Jens Axboe
-Subject: Limit recursion of the request handler
-Patch-mainline:
-References: 170315
-
-Don't recurse on block layer requeues, as they are most likely don't
-because of driver/hardware starvation problems and rehitting the queue
-directly from that path then only does harm.
-
-Same for blk_run_queue(), apply same level of 1-deep recursion that
-blk_start_queue() does.
-
-Acked-by:
-Signed-off-by:
-
---- linux-2.6.16/block/elevator.c~ 2006-05-03 13:41:35.000000000 +0200
-+++ linux-2.6.16/block/elevator.c 2006-05-03 13:41:41.000000000 +0200
-@@ -314,6 +314,7 @@ void elv_insert(request_queue_t *q, stru
- {
- struct list_head *pos;
- unsigned ordseq;
-+ int unplug_it = 1;
-
- rq->q = q;
-
-@@ -378,6 +379,11 @@ void elv_insert(request_queue_t *q, stru
- }
-
- list_add_tail(&rq->queuelist, pos);
-+ /*
-+ * most requeues happen because of a busy condition, don't
-+ * force unplug of the queue for that case.
-+ */
-+ unplug_it = 0;
- break;
-
- default:
-@@ -386,7 +392,7 @@ void elv_insert(request_queue_t *q, stru
- BUG();
- }
-
-- if (blk_queue_plugged(q)) {
-+ if (unplug_it && blk_queue_plugged(q)) {
- int nrq = q->rq.count[READ] + q->rq.count[WRITE]
- - q->in_flight;
-
---- linux-2.6.16/block/ll_rw_blk.c~ 2006-05-03 13:41:38.000000000 +0200
-+++ linux-2.6.16/block/ll_rw_blk.c 2006-05-03 13:41:41.000000000 +0200
-@@ -1722,8 +1722,21 @@ void blk_run_queue(struct request_queue
-
- spin_lock_irqsave(q->queue_lock, flags);
- blk_remove_plug(q);
-- if (!elv_queue_empty(q))
-- q->request_fn(q);
-+
-+ /*
-+ * Only recurse once to avoid overrunning the stack, let the unplug
-+ * handling reinvoke the handler shortly if we already got there.
-+ */
-+ if (!elv_queue_empty(q)) {
-+ if (!test_and_set_bit(QUEUE_FLAG_REENTER, &q->queue_flags)) {
-+ q->request_fn(q);
-+ clear_bit(QUEUE_FLAG_REENTER, &q->queue_flags);
-+ } else {
-+ blk_plug_device(q);
-+ kblockd_schedule_work(&q->unplug_work);
-+ }
-+ }
-+
- spin_unlock_irqrestore(q->queue_lock, flags);
- }
- EXPORT_SYMBOL(blk_run_queue);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/compat_sys_ppoll-typo.patch new/patches.fixes/compat_sys_ppoll-typo.patch
--- old/patches.fixes/compat_sys_ppoll-typo.patch 2006-05-17 10:18:57.000000000 +0200
+++ new/patches.fixes/compat_sys_ppoll-typo.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Subject: [PATCH] fs/compat.c: fix 'if (a |= b )' typo
-From: Alexey Dobriyan
-X-Git-Commit: 3835a9bd07778d87dea37fbf190f70883515e8fc
-
-Mentioned by Mark Armbrust somewhere on Usenet.
-
-
-Signed-off-by: Olaf Hering
-
- fs/compat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: linux-2.6.16/fs/compat.c
-===================================================================
---- linux-2.6.16.orig/fs/compat.c
-+++ linux-2.6.16/fs/compat.c
-@@ -1901,7 +1901,7 @@ asmlinkage long compat_sys_ppoll(struct
- }
-
- if (sigmask) {
-- if (sigsetsize |= sizeof(compat_sigset_t))
-+ if (sigsetsize != sizeof(compat_sigset_t))
- return -EINVAL;
- if (copy_from_user(&ss32, sigmask, sizeof(ss32)))
- return -EFAULT;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 new/patches.fixes/ethtool-always-report-port-is-TP-on-tg3
--- old/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 2006-05-16 13:44:17.000000000 +0200
+++ new/patches.fixes/ethtool-always-report-port-is-TP-on-tg3 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-From: Karsten Keil
-Date: Fri May 12 11:59:11 2006 +0200
-Subject: [PATCH] ethtool always report port is TP on tg3
-Reference: 170869
-Is-Mainline: 2.6.17
-
-Even with fiber cards ethtool reports that the connected port is TP,
-the patch fix this.
-
-Signed-off-by: Karsten Keil
----
-
- drivers/net/tg3.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-5ed8e79c778ee803e44a325a1e15c0cb3f52d0ff
-diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
-index beeb612..0b5bc93 100644
---- a/drivers/net/tg3.c
-+++ b/drivers/net/tg3.c
-@@ -7653,21 +7653,23 @@ static int tg3_get_settings(struct net_d
- cmd->supported |= (SUPPORTED_1000baseT_Half |
- SUPPORTED_1000baseT_Full);
-
-- if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES))
-+ if (!(tp->tg3_flags2 & TG3_FLG2_ANY_SERDES)) {
- cmd->supported |= (SUPPORTED_100baseT_Half |
- SUPPORTED_100baseT_Full |
- SUPPORTED_10baseT_Half |
- SUPPORTED_10baseT_Full |
- SUPPORTED_MII);
-- else
-+ cmd->port = PORT_TP;
-+ } else {
- cmd->supported |= SUPPORTED_FIBRE;
-+ cmd->port = PORT_FIBRE;
-+ }
-
- cmd->advertising = tp->link_config.advertising;
- if (netif_running(dev)) {
- cmd->speed = tp->link_config.active_speed;
- cmd->duplex = tp->link_config.active_duplex;
- }
-- cmd->port = 0;
- cmd->phy_address = PHY_ADDR;
- cmd->transceiver = 0;
- cmd->autoneg = tp->link_config.autoneg;
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch new/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch
--- old/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch 2006-05-07 00:45:17.000000000 +0200
+++ new/patches.fixes/fs-locks.c-Fix-sys_flock-race.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-From nobody Mon Sep 17 00:00:00 2001
-From: Trond Myklebust
-Date: Fri, 31 Mar 2006 02:30:55 -0800
-Subject: [PATCH] fs/locks.c: Fix sys_flock() race
-References: 173001
-Patch-mainline: 2.6.17-rc1
-
-sys_flock() currently has a race which can result in a double free in the
-multi-thread case.
-
-Thread 1 Thread 2
-
-sys_flock(file, LOCK_EX)
- sys_flock(file, LOCK_UN)
-
-If Thread 2 removes the lock from inode->i_lock before Thread 1 tests for
-list_empty(&lock->fl_link) at the end of sys_flock, then both threads will
-end up calling locks_free_lock for the same lock.
-
-Fix is to make flock_lock_file() do the same as posix_lock_file(), namely
-to make a copy of the request, so that the caller can always free the lock.
-
-This also has the side-effect of fixing up a reference problem in the
-lockd handling of flock.
-
-Signed-off-by: Trond Myklebust
-Signed-off-by: Andrew Morton
-Signed-off-by: Linus Torvalds
-Signed-off-by: Greg Kroah-Hartman
-
----
- fs/locks.c | 30 ++++++++++++++++--------------
- 1 file changed, 16 insertions(+), 14 deletions(-)
-
---- linux-2.6.16.13.orig/fs/locks.c
-+++ linux-2.6.16.13/fs/locks.c
-@@ -712,8 +712,9 @@ EXPORT_SYMBOL(posix_locks_deadlock);
- * at the head of the list, but that's secret knowledge known only to
- * flock_lock_file and posix_lock_file.
- */
--static int flock_lock_file(struct file *filp, struct file_lock *new_fl)
-+static int flock_lock_file(struct file *filp, struct file_lock *request)
- {
-+ struct file_lock *new_fl = NULL;
- struct file_lock **before;
- struct inode * inode = filp->f_dentry->d_inode;
- int error = 0;
-@@ -728,17 +729,19 @@ static int flock_lock_file(struct file *
- continue;
- if (filp != fl->fl_file)
- continue;
-- if (new_fl->fl_type == fl->fl_type)
-+ if (request->fl_type == fl->fl_type)
- goto out;
- found = 1;
- locks_delete_lock(before);
- break;
- }
-- unlock_kernel();
-
-- if (new_fl->fl_type == F_UNLCK)
-- return 0;
-+ if (request->fl_type == F_UNLCK)
-+ goto out;
-
-+ new_fl = locks_alloc_lock();
-+ if (new_fl == NULL)
-+ goto out;
- /*
- * If a higher-priority process was blocked on the old file lock,
- * give it the opportunity to lock the file.
-@@ -746,26 +749,27 @@ static int flock_lock_file(struct file *
- if (found)
- cond_resched();
-
-- lock_kernel();
- for_each_lock(inode, before) {
- struct file_lock *fl = *before;
- if (IS_POSIX(fl))
- break;
- if (IS_LEASE(fl))
- continue;
-- if (!flock_locks_conflict(new_fl, fl))
-+ if (!flock_locks_conflict(request, fl))
- continue;
- error = -EAGAIN;
-- if (new_fl->fl_flags & FL_SLEEP) {
-- locks_insert_block(fl, new_fl);
-- }
-+ if (request->fl_flags & FL_SLEEP)
-+ locks_insert_block(fl, request);
- goto out;
- }
-+ locks_copy_lock(new_fl, request);
- locks_insert_lock(&inode->i_flock, new_fl);
-- error = 0;
-+ new_fl = NULL;
-
- out:
- unlock_kernel();
-+ if (new_fl)
-+ locks_free_lock(new_fl);
- return error;
- }
-
-@@ -1529,9 +1533,7 @@ asmlinkage long sys_flock(unsigned int f
- error = flock_lock_file_wait(filp, lock);
-
- out_free:
-- if (list_empty(&lock->fl_link)) {
-- locks_free_lock(lock);
-- }
-+ locks_free_lock(lock);
-
- out_putf:
- fput(filp);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fusion-fix-kdump-drvinit new/patches.fixes/fusion-fix-kdump-drvinit
--- old/patches.fixes/fusion-fix-kdump-drvinit 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/fusion-fix-kdump-drvinit 2006-05-22 15:20:01.000000000 +0200
@@ -0,0 +1,154 @@
+From: Vivek Goyal
+Subject: System hung while trying to boot to the second kernel after
+ triggering a dump
+References: #173275 - LTC23573
+Patch-Mainline: 2.6.17-mm
+
+MPT fusion driver initialization fails while second kernel is booting,
+after a system crash (if kdump kernel is configured). Oops message is
+pasted below. I have attached a patch to fix the issue. Your suggestions
+are welcome.
+
+
+Signed-off-by: Vivek Goyal
+Cc: "Moore, Eric Dean"
+Signed-off-by: Andrew Morton
+Signed-off-by: Maneesh Soni
+Signed-off-by: Eric Moore
+Signed-off-by: Hannes Reinecke
+---
+
+diff -urNp linux-2.6.16.13-20060504150636/drivers/message/fusion/mptbase.c linux-2.6.16.13-20060504150636-23573/drivers/message/fusion/mptbase.c
+--- linux-2.6.16.13-20060504150636/drivers/message/fusion/mptbase.c 2006-05-05 16:41:57.000000000 +0530
++++ linux-2.6.16.13-20060504150636-23573/drivers/message/fusion/mptbase.c 2006-05-05 16:49:24.000000000 +0530
+@@ -1386,39 +1386,6 @@ mpt_attach(struct pci_dev *pdev, const s
+ /* Set lookup ptr. */
+ list_add_tail(&ioc->list, &ioc_list);
+
+- ioc->pci_irq = -1;
+- if (pdev->irq) {
+- if (mpt_msi_enable && !pci_enable_msi(pdev))
+- printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n", ioc->name);
+-
+- r = request_irq(pdev->irq, mpt_interrupt, SA_SHIRQ, ioc->name, ioc);
+-
+- if (r < 0) {
+-#ifndef __sparc__
+- printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %d!\n",
+- ioc->name, pdev->irq);
+-#else
+- printk(MYIOC_s_ERR_FMT "Unable to allocate interrupt %s!\n",
+- ioc->name, __irq_itoa(pdev->irq));
+-#endif
+- list_del(&ioc->list);
+- iounmap(mem);
+- kfree(ioc);
+- return -EBUSY;
+- }
+-
+- ioc->pci_irq = pdev->irq;
+-
+- pci_set_master(pdev); /* ?? */
+- pci_set_drvdata(pdev, ioc);
+-
+-#ifndef __sparc__
+- dprintk((KERN_INFO MYNAM ": %s installed at interrupt %d\n", ioc->name, pdev->irq));
+-#else
+- dprintk((KERN_INFO MYNAM ": %s installed at interrupt %s\n", ioc->name, __irq_itoa(pdev->irq)));
+-#endif
+- }
+-
+ /* Check for "bound ports" (929, 929X, 1030, 1035) to reduce redundant resets.
+ */
+ mpt_detect_bound_ports(ioc, pdev);
+@@ -1428,11 +1395,7 @@ mpt_attach(struct pci_dev *pdev, const s
+ printk(KERN_WARNING MYNAM
+ ": WARNING - %s did not initialize properly! (%d)\n",
+ ioc->name, r);
+-
+ list_del(&ioc->list);
+- free_irq(ioc->pci_irq, ioc);
+- if (mpt_msi_enable)
+- pci_disable_msi(pdev);
+ if (ioc->alt_ioc)
+ ioc->alt_ioc->alt_ioc = NULL;
+ iounmap(mem);
+@@ -1636,6 +1599,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
+ int handlers;
+ int ret = 0;
+ int reset_alt_ioc_active = 0;
++ int irq_allocated = 0;
+
+ printk(KERN_INFO MYNAM ": Initiating %s %s\n",
+ ioc->name, reason==MPT_HOSTEVENT_IOC_BRINGUP ? "bringup" : "recovery");
+@@ -1719,6 +1683,48 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
+ }
+ }
+
++ /*
++ * Device is reset now. It must have de-asserted the interrupt line
++ * (if it was asserted) and it should be safe to register for the
++ * interrupt now.
++ */
++ if ((ret == 0) && (reason == MPT_HOSTEVENT_IOC_BRINGUP)) {
++ ioc->pci_irq = -1;
++ if (ioc->pcidev->irq) {
++ if (mpt_msi_enable && !pci_enable_msi(ioc->pcidev))
++ printk(MYIOC_s_INFO_FMT "PCI-MSI enabled\n",
++ ioc->name);
++ rc = request_irq(ioc->pcidev->irq, mpt_interrupt,
++ SA_SHIRQ, ioc->name, ioc);
++ if (rc < 0) {
++#ifndef __sparc__
++ printk(MYIOC_s_ERR_FMT "Unable to allocate "
++ "interrupt %d!\n", ioc->name,
++ ioc->pcidev->irq);
++#else
++ printk(MYIOC_s_ERR_FMT "Unable to allocate "
++ "interrupt %s!\n", ioc->name,
++ __irq_itoa(ioc->pcidev->irq));
++#endif
++ if (mpt_msi_enable)
++ pci_disable_msi(ioc->pcidev);
++ return -EBUSY;
++ }
++ irq_allocated = 1;
++ ioc->pci_irq = ioc->pcidev->irq;
++ pci_set_master(ioc->pcidev); /* ?? */
++ pci_set_drvdata(ioc->pcidev, ioc);
++#ifndef __sparc__
++ dprintk((KERN_INFO MYNAM ": %s installed at interrupt "
++ "%d\n", ioc->name, ioc->pcidev->irq));
++#else
++ dprintk((KERN_INFO MYNAM ": %s installed at interrupt "
++ "%s\n", ioc->name,
++ __irq_itoa(ioc->pcidev->irq)));
++#endif
++ }
++ }
++
+ /* Prime reply & request queues!
+ * (mucho alloc's) Must be done prior to
+ * init as upper addresses are needed for init.
+@@ -1818,7 +1824,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
+ ret = mptbase_sas_persist_operation(ioc,
+ MPI_SAS_OP_CLEAR_NOT_PRESENT);
+ if(ret != 0)
+- return -1;
++ goto out;
+ }
+
+ /* Find IM volumes
+@@ -1899,6 +1905,12 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u3
+ /* FIXME? Examine results here? */
+ }
+
++out:
++ if ((ret != 0) && irq_allocated) {
++ free_irq(ioc->pci_irq, ioc);
++ if (mpt_msi_enable)
++ pci_disable_msi(ioc->pcidev);
++ }
+ return ret;
+ }
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/iosapic-move-irq new/patches.fixes/iosapic-move-irq
--- old/patches.fixes/iosapic-move-irq 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/iosapic-move-irq 2006-05-23 17:39:33.000000000 +0200
@@ -0,0 +1,44 @@
+From: Ken Chen
+Subject: [IA64] fix broken irq affinity
+References: 176697
+Acked-by: schwab@suse.de
+Patch-mainline: yes
+
+When CONFIG_PCI_MSI is set, move_irq() is an empty function, causing
+grief when sys admin tries to bind interrupt to CPU.
+
+Signed-off-by: Ken Chen
+Signed-off-by: Tony Luck
+
+---
+commit 41503def5d83bada6a2fd792e636ccc28a285f38
+tree 4f2c602db9cf66232001baa3be9f5952b8a50266
+parent 1101ece44e00cfe31a2fd9d3222d05f927b00ef8
+author Chen, Kenneth W Tue, 16 May 2006 16:29:00 -0700
+committer Tony Luck Wed, 17 May 2006 06:20:23 -0700
+
+ arch/ia64/kernel/iosapic.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
+index 7956eb9..d58c1c5 100644
+--- a/arch/ia64/kernel/iosapic.c
++++ b/arch/ia64/kernel/iosapic.c
+@@ -416,7 +416,7 @@ iosapic_end_level_irq (unsigned int irq)
+ ia64_vector vec = irq_to_vector(irq);
+ struct iosapic_rte_info *rte;
+
+- move_irq(irq);
++ move_native_irq(irq);
+ list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list)
+ iosapic_eoi(rte->addr, vec);
+ }
+@@ -458,7 +458,7 @@ iosapic_ack_edge_irq (unsigned int irq)
+ {
+ irq_desc_t *idesc = irq_descp(irq);
+
+- move_irq(irq);
++ move_native_irq(irq);
+ /*
+ * Once we have recorded IRQ_PENDING already, we can mask the
+ * interrupt for real. This prevents IRQ storms from unhandled
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch new/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch
--- old/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch 2006-05-23 18:05:31.000000000 +0200
@@ -0,0 +1,47 @@
+From: Thomas Renninger
+Subject: Fix for apic initialization bug using kdump
+Patch-mainline: not yet
+References: 177741
+
+o Kdump second kernel boot fails after a system crash if second kernel
+ is UP and acpi=off and if crash occurred on a non-boot cpu.
+
+o Issue here is that MP tables report boot cpu lapic id as 0 but second
+ kernel is booting on a different processor and MP table data is stale
+ in this context. Hence apic_id_registered() check fails in setup_local_APIC()
+ when called from APIC_init_uniprocessor().
+
+o Problem is not seen if ACPI is enabled as in that case
+ boot_cpu_physical_apicid is read from the LAPIC.
+
+o Problem is not seen with SMP kernels as well because in this case also
+ boot_cpu_physical_apicid is read from LAPIC. (smp_boot_cpus()).
+
+o The problem is fixed by reading boot_cpu_physical_apicid from LAPIC
+ if it is a UP kernel and CRASH_DUMP is enabled.
+
+Signed-off-by: Vivek Goyal
+---
+
+ arch/i386/kernel/apic.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff -puN arch/i386/kernel/apic.c~kdump-i386-boot-cpu-physical-apicid-fix-take2 arch/i386/kernel/apic.c
+--- linux-2.6.17-rc4-16M/arch/i386/kernel/apic.c~kdump-i386-boot-cpu-physical-apicid-fix-take2 2006-05-18 11:26:45.000000000 -0400
++++ linux-2.6.17-rc4-16M-root/arch/i386/kernel/apic.c 2006-05-18 11:26:45.000000000 -0400
+@@ -1341,6 +1341,14 @@ int __init APIC_init_uniprocessor (void)
+
+ connect_bsp_APIC();
+
++ /*
++ * Hack: In case of kdump, after a crash, kernel might be booting
++ * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
++ * might be zero if read from MP tables. Get it from LAPIC.
++ */
++#ifdef CONFIG_CRASH_DUMP
++ boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
++#endif
+ phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);
+
+ setup_local_APIC();
+_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch new/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch
--- old/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch 2006-05-18 20:34:49.000000000 +0200
+++ new/patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,146 +0,0 @@
-From owner-linux-pci@atrey.karlin.mff.cuni.cz Wed May 17 11:04:37 2006
-Subject: PCI: correctly allocate return buffers for osc calls
-From: Kristen Accardi
-To: linux-pci@atrey.karlin.mff.cuni.cz
-Cc: linux-kernel@vger.kernel.org, greg@kroah.com
-Date: Wed, 17 May 2006 11:13:37 -0700
-Message-Id: <1147889618.8472.6.camel@whizzy>
-Patch-mainline: 2.6.16.18
-References: 171362
-
-The OSC set and query functions do not allocate enough space for return values,
-and set the output buffer length to a false, too large value. This causes the
-acpi-ca code to assume that the output buffer is larger than it actually is,
-and overwrite memory when copying acpi return buffers into this caller provided
-buffer. In some cases this can cause kernel oops if the memory that is
-overwritten is a pointer. This patch will change these calls to use a
-dynamically allocated output buffer, thus allowing the acpi-ca code to decide
-how much space is needed.
-
-Signed-off-by: Kristen Carlson Accardi
-Signed-off-by: Greg Kroah-Hartman
-
----
- drivers/pci/pci-acpi.c | 60 ++++++++++++++++++++++++++++---------------------
- 1 file changed, 35 insertions(+), 25 deletions(-)
-
---- gregkh-2.6.orig/drivers/pci/pci-acpi.c
-+++ gregkh-2.6/drivers/pci/pci-acpi.c
-@@ -33,13 +33,10 @@ acpi_query_osc (
- acpi_status status;
- struct acpi_object_list input;
- union acpi_object in_params[4];
-- struct acpi_buffer output;
-- union acpi_object out_obj;
-+ struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-+ union acpi_object *out_obj;
- u32 osc_dw0;
-
-- /* Setting up output buffer */
-- output.length = sizeof(out_obj) + 3*sizeof(u32);
-- output.pointer = &out_obj;
-
- /* Setting up input parameters */
- input.count = 4;
-@@ -61,12 +58,15 @@ acpi_query_osc (
- "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
- return status;
- }
-- if (out_obj.type != ACPI_TYPE_BUFFER) {
-+ out_obj = output.pointer;
-+
-+ if (out_obj->type != ACPI_TYPE_BUFFER) {
- printk(KERN_DEBUG
- "Evaluate _OSC returns wrong type\n");
-- return AE_TYPE;
-+ status = AE_TYPE;
-+ goto query_osc_out;
- }
-- osc_dw0 = *((u32 *) out_obj.buffer.pointer);
-+ osc_dw0 = *((u32 *) out_obj->buffer.pointer);
- if (osc_dw0) {
- if (osc_dw0 & OSC_REQUEST_ERROR)
- printk(KERN_DEBUG "_OSC request fails\n");
-@@ -76,15 +76,21 @@ acpi_query_osc (
- printk(KERN_DEBUG "_OSC invalid revision\n");
- if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
- /* Update Global Control Set */
-- global_ctrlsets = *((u32 *)(out_obj.buffer.pointer+8));
-- return AE_OK;
-+ global_ctrlsets = *((u32 *)(out_obj->buffer.pointer+8));
-+ status = AE_OK;
-+ goto query_osc_out;
- }
-- return AE_ERROR;
-+ status = AE_ERROR;
-+ goto query_osc_out;
- }
-
- /* Update Global Control Set */
-- global_ctrlsets = *((u32 *)(out_obj.buffer.pointer + 8));
-- return AE_OK;
-+ global_ctrlsets = *((u32 *)(out_obj->buffer.pointer + 8));
-+ status = AE_OK;
-+
-+query_osc_out:
-+ kfree(output.pointer);
-+ return status;
- }
-
-
-@@ -96,14 +102,10 @@ acpi_run_osc (
- acpi_status status;
- struct acpi_object_list input;
- union acpi_object in_params[4];
-- struct acpi_buffer output;
-- union acpi_object out_obj;
-+ struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-+ union acpi_object *out_obj;
- u32 osc_dw0;
-
-- /* Setting up output buffer */
-- output.length = sizeof(out_obj) + 3*sizeof(u32);
-- output.pointer = &out_obj;
--
- /* Setting up input parameters */
- input.count = 4;
- input.pointer = in_params;
-@@ -124,12 +126,14 @@ acpi_run_osc (
- "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
- return status;
- }
-- if (out_obj.type != ACPI_TYPE_BUFFER) {
-+ out_obj = output.pointer;
-+ if (out_obj->type != ACPI_TYPE_BUFFER) {
- printk(KERN_DEBUG
- "Evaluate _OSC returns wrong type\n");
-- return AE_TYPE;
-+ status = AE_TYPE;
-+ goto run_osc_out;
- }
-- osc_dw0 = *((u32 *) out_obj.buffer.pointer);
-+ osc_dw0 = *((u32 *) out_obj->buffer.pointer);
- if (osc_dw0) {
- if (osc_dw0 & OSC_REQUEST_ERROR)
- printk(KERN_DEBUG "_OSC request fails\n");
-@@ -139,11 +143,17 @@ acpi_run_osc (
- printk(KERN_DEBUG "_OSC invalid revision\n");
- if (osc_dw0 & OSC_CAPABILITIES_MASK_ERROR) {
- printk(KERN_DEBUG "_OSC FW not grant req. control\n");
-- return AE_SUPPORT;
-+ status = AE_SUPPORT;
-+ goto run_osc_out;
- }
-- return AE_ERROR;
-+ status = AE_ERROR;
-+ goto run_osc_out;
- }
-- return AE_OK;
-+ status = AE_OK;
-+
-+run_osc_out:
-+ kfree(output.pointer);
-+ return status;
- }
-
- /**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sd-fix-unknown-size new/patches.fixes/sd-fix-unknown-size
--- old/patches.fixes/sd-fix-unknown-size 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/sd-fix-unknown-size 2006-05-22 16:37:02.000000000 +0200
@@ -0,0 +1,23 @@
+From: Mike Anderson
+Subject: Wrong size information for device with disabled read access
+References: #176780 - LTC23895
+
+When accessing a device with disabled read access the capacity is set
+randomly to 1GB. This makes it impossible to userspace tools to detect
+invalid device capacities.
+
+Signed-off-by: Mike Anderson
+Acked-by: Chris Mason
+Signed-off-by: Hannes Reinecke
+
+--- linux-2.6.16/drivers/scsi/sd.c.orig 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/drivers/scsi/sd.c 2006-05-22 16:24:09.531915172 +0200
+@@ -1107,7 +1107,7 @@ repeat:
+ /* Either no media are present but the drive didn't tell us,
+ or they are present but the read capacity command fails */
+ /* sdkp->media_present = 0; -- not always correct */
+- sdkp->capacity = 0x200000; /* 1 GB - random */
++ sdkp->capacity = 0; /* unknown mapped to zero - as usual */
+
+ return;
+ } else if (the_result && longrc) {
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 11432 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/rtnetlink-atomic2.patch new/patches.suse/rtnetlink-atomic2.patch
--- old/patches.suse/rtnetlink-atomic2.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/rtnetlink-atomic2.patch 2006-05-23 17:46:51.000000000 +0200
@@ -0,0 +1,30 @@
+From: Jaroslav Kysela
+Subject: Fix debug traces for bonding (might_sleep)
+References: 174843
+
+The network bonding module might call rtmsg_ifinfo in the atomic context.
+It is not ideal solution - ideally, the bonding module will use a workqueue.
+
+Signed-off-by: Jaroslav Kysela
+Acked-by: Olaf Kirch
+
+--- linux-2.6.16.orig/net/core/rtnetlink.c 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16/net/core/rtnetlink.c 2006-05-23 17:25:00.000000000 +0200
+@@ -451,7 +451,7 @@ void rtmsg_ifinfo(int type, struct net_d
+ sizeof(struct rtnl_link_ifmap) +
+ sizeof(struct rtnl_link_stats) + 128);
+
+- skb = alloc_skb(size, GFP_KERNEL);
++ skb = alloc_skb(size, in_atomic() ? GFP_ATOMIC : GFP_KERNEL);
+ if (!skb)
+ return;
+
+@@ -460,7 +460,7 @@ void rtmsg_ifinfo(int type, struct net_d
+ return;
+ }
+ NETLINK_CB(skb).dst_group = RTNLGRP_LINK;
+- netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, GFP_KERNEL);
++ netlink_broadcast(rtnl, skb, 0, RTNLGRP_LINK, in_atomic() ? GFP_ATOMIC : GFP_KERNEL);
+ }
+
+ /* Protected by RTNL sempahore. */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/tcp-proc-listen new/patches.suse/tcp-proc-listen
--- old/patches.suse/tcp-proc-listen 2006-05-19 13:01:33.000000000 +0200
+++ new/patches.suse/tcp-proc-listen 2006-05-22 13:32:01.000000000 +0200
@@ -7,33 +7,6 @@
In SLES9 we had /proc/net/tcp_listen to make this cheaper.
This is a forward port.
-Index: linux-2.6.16/include/net/tcp.h
-===================================================================
---- linux-2.6.16.orig/include/net/tcp.h
-+++ linux-2.6.16/include/net/tcp.h
-@@ -1054,7 +1054,10 @@ struct tcp_seq_afinfo {
- struct module *owner;
- char *name;
- sa_family_t family;
-+ void * (*seq_start)(struct seq_file *seq, loff_t *pos);
- int (*seq_show) (struct seq_file *m, void *v);
-+ void * (*seq_next)(struct seq_file *seq, void *v, loff_t *pos);
-+
- struct file_operations *seq_fops;
- };
-
-@@ -1069,6 +1072,11 @@ struct tcp_iter_state {
- extern int tcp_proc_register(struct tcp_seq_afinfo *afinfo);
- extern void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo);
-
-+extern void *tcp_seq_start(struct seq_file *seq, loff_t *pos);
-+extern void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos);
-+extern void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos);
-+extern void *tcp_listen_seq_next(struct seq_file *seq, void *v, loff_t *pos);
-+
- extern struct request_sock_ops tcp_request_sock_ops;
-
- extern int tcp_v4_destroy_sock(struct sock *sk);
Index: linux-2.6.16/net/ipv4/tcp_ipv4.c
===================================================================
--- linux-2.6.16.orig/net/ipv4/tcp_ipv4.c
@@ -85,7 +58,7 @@
--*pos;
}
return rc;
-@@ -1524,17 +1530,22 @@ static void *established_get_idx(struct
+@@ -1524,16 +1530,18 @@ static void *established_get_idx(struct
return rc;
}
@@ -100,18 +73,13 @@
- rc = listening_get_idx(seq, &pos);
+ rc = listening_get_idx(seq, &pos, listenonly);
-- if (!rc) {
-+ if (!rc)
+ if (!rc) {
++ if (listenonly)
++ return rc;
inet_listen_unlock(&tcp_hashinfo);
-+
-+ if (listenonly)
-+ return rc;
-+
-+ if (!rc) {
local_bh_disable();
st->state = TCP_SEQ_STATE_ESTABLISHED;
- rc = established_get_idx(seq, pos);
-@@ -1543,21 +1554,34 @@ static void *tcp_get_idx(struct seq_file
+@@ -1543,21 +1551,34 @@ static void *tcp_get_idx(struct seq_file
return rc;
}
@@ -128,14 +96,14 @@
+void *tcp_seq_start(struct seq_file *seq, loff_t *pos)
+{
+ return __tcp_seq_start(seq, pos, 0);
-+}
-+
-+void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos)
-+{
-+ return __tcp_seq_start(seq, pos, 1);
}
-static void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
++void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos)
++{
++ return __tcp_seq_start(seq, pos, 1);
++}
++
+EXPORT_SYMBOL_GPL(tcp_seq_start);
+EXPORT_SYMBOL_GPL(tcp_listen_seq_start);
+
@@ -150,7 +118,7 @@
goto out;
}
st = seq->private;
-@@ -1565,7 +1589,7 @@ static void *tcp_seq_next(struct seq_fil
+@@ -1565,7 +1586,7 @@ static void *tcp_seq_next(struct seq_fil
switch (st->state) {
case TCP_SEQ_STATE_OPENREQ:
case TCP_SEQ_STATE_LISTENING:
@@ -159,7 +127,7 @@
if (!rc) {
inet_listen_unlock(&tcp_hashinfo);
local_bh_disable();
-@@ -1582,6 +1606,17 @@ out:
+@@ -1582,6 +1603,17 @@ out:
++*pos;
return rc;
}
@@ -177,7 +145,7 @@
static void tcp_seq_stop(struct seq_file *seq, void *v)
{
-@@ -1621,8 +1656,8 @@ static int tcp_seq_open(struct inode *in
+@@ -1621,8 +1653,8 @@ static int tcp_seq_open(struct inode *in
return -ENOMEM;
memset(s, 0, sizeof(*s));
s->family = afinfo->family;
@@ -188,7 +156,7 @@
s->seq_ops.show = afinfo->seq_show;
s->seq_ops.stop = tcp_seq_stop;
-@@ -1795,18 +1830,36 @@ static struct tcp_seq_afinfo tcp4_seq_af
+@@ -1795,18 +1827,36 @@ static struct tcp_seq_afinfo tcp4_seq_af
.owner = THIS_MODULE,
.name = "tcp",
.family = AF_INET,
@@ -267,3 +235,30 @@
}
#endif
+Index: linux-2.6.16/include/net/tcp.h
+===================================================================
+--- linux-2.6.16.orig/include/net/tcp.h
++++ linux-2.6.16/include/net/tcp.h
+@@ -1054,7 +1054,10 @@ struct tcp_seq_afinfo {
+ struct module *owner;
+ char *name;
+ sa_family_t family;
++ void * (*seq_start)(struct seq_file *seq, loff_t *pos);
+ int (*seq_show) (struct seq_file *m, void *v);
++ void * (*seq_next)(struct seq_file *seq, void *v, loff_t *pos);
++
+ struct file_operations *seq_fops;
+ };
+
+@@ -1069,6 +1072,11 @@ struct tcp_iter_state {
+ extern int tcp_proc_register(struct tcp_seq_afinfo *afinfo);
+ extern void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo);
+
++extern void *tcp_seq_start(struct seq_file *seq, loff_t *pos);
++extern void *tcp_listen_seq_start(struct seq_file *seq, loff_t *pos);
++extern void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos);
++extern void *tcp_listen_seq_next(struct seq_file *seq, void *v, loff_t *pos);
++
+ extern struct request_sock_ops tcp_request_sock_ops;
+
+ extern int tcp_v4_destroy_sock(struct sock *sk);
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-05-19 17:51:28.000000000 +0200
+++ kernel-source/series.conf 2006-05-24 18:53:59.000000000 +0200
@@ -21,8 +21,7 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
- patches.kernel.org/patch-2.6.16.16
- patches.fixes/compat_sys_ppoll-typo.patch
+ patches.kernel.org/patch-2.6.16.18
patches.fixes/setuid-dumpable-wrongdir
patches.fixes/git-kbuild.patch
@@ -118,6 +117,7 @@
patches.arch/x86_64-nommu-warning
patches.arch/x86_64-hotadd-fixes
patches.arch/x86_64-empty-node0
+ patches.arch/x86_64-bad-addr-boundary
# for i386/x86-64
patches.arch/tune-generic
@@ -275,6 +275,7 @@
patches.arch/acpi_ibm_notify.patch
patches.fixes/acpi-nolapic
+ patches.fixes/kdump-i386-boot-cpu-physical-apicid-fix-take2.patch
patches.arch/acpi_processor_exit_acpi_off
@@ -287,6 +288,9 @@
patches.fixes/powernow-fix-3
patches.fixes/cpufreq_sysfs_max_override.patch
+ # EC fixes
+ patches.fixes/acpi_ec_dummy.patch
+
# Fix IA64 unalignment issue
patches.arch/ia64_acpi_unalignments.patch
@@ -427,8 +431,11 @@
patches.drivers/lpfc-8.1.6-update
patches.drivers/snsc-powerdown-events
patches.drivers/sgi-ioc4-detect-variant.patch
+ patches.drivers/altix-correct-ioc3-port-order.patch
+ patches.drivers/altix-correct-ioc4-port-order.patch
patches.drivers/ide-acpi-support
patches.drivers/fix-b44-checks
+ patches.drivers/b44-fix_mac_address
########################################################
# Storage
@@ -465,6 +472,7 @@
patches.fixes/tulip-quad-NIC-ifdown
patches.suse/prism-defaultmac
patches.suse/nameif-track-rename.patch
+ patches.suse/rtnetlink-atomic2.patch
# fix a oops on unload still active isdn drivers
# TODO: send upstream
@@ -527,7 +535,10 @@
patches.drivers/pci-0041-Provide-a-boot-parameter-to-disable-MSI.patch
patches.drivers/pci-hotplug-sn-fix-cleanup-on-hotplug-removal-of-ppb.patch
patches.drivers/pci-delete-ACPI-hook-from-pci_set_power_state.patch
- patches.fixes/pci-correctly-allocate-return-buffers-for-osc-calls.patch
+
+ # new device ids for PCI devices
+ patches.drivers/ati-sb600-ahci-support.patch
+ patches.drivers/ati-sb600-ide-support.patch
########################################################
# sysfs / driver core
@@ -750,6 +761,8 @@
patches.arch/s390-03-03-october2005.diff
patches.arch/s390-03-04-october2005.diff
+ patches.arch/s390-zfcp-statistics.diff
+ patches.arch/s390-zfcp-statistic-disclaimer.diff
patches.arch/s390-dasd-eer-october2005.diff
patches.arch/s390-dasd-uid.diff
patches.arch/s390-dasd-fba-uid.diff
@@ -948,6 +961,7 @@
patches.drivers/aic79xx-avoid-renegotiation
patches.drivers/aic79xx-target-hotplug-fixes
patches.drivers/aic79xx-external-bus-reset
+ patches.drivers/aic79xx-remove-slave-alloc
patches.fixes/altix-asic-workarounds
patches.arch/ia64-sn2-tioce_provider
@@ -1136,11 +1150,9 @@
patches.fixes/ondemand-workqueue
patches.drivers/ibmvscsi-RAID-failure
patches.drivers/mptfc_rolechg_sles10.patch
- patches.fixes/blk-limit-recursion
patches.fixes/memcpy-mck
patches.fixes/i2o_exec_lct_modified-memoryleak-fix.patch
patches.fixes/cfq-queueing-fixes
- patches.fixes/fs-locks.c-Fix-sys_flock-race.patch
patches.fixes/nfsd-path-release-fix
patches.suse/reiserfs-periodic-flush-latency
patches.fixes/nfsd-set-user-fix
@@ -1159,13 +1171,19 @@
patches.fixes/scsi-fix-scan-offline.patch
patches.fixes/scsi-add-2104-DU3-blist.patch
patches.suse/lkcd-crash-with-invalid-DUMPDEV
- patches.fixes/ethtool-always-report-port-is-TP-on-tg3
patches.drivers/qla2xxx-vpd-sysfs-attribute
patches.fixes/fusion-fix-reset-handler
patches.fixes/scheduler-wakeup-no-starvation
patches.fixes/nf_bridge-header-size
+ patches.drivers/mptfc-sles10-update
+ patches.fixes/fusion-fix-kdump-drvinit
+ patches.fixes/sd-fix-unknown-size
+
+ # bug #176697
+ patches.fixes/iosapic-move-irq
+
# PLEASE KEEP THESE PATCHES AT THE END OF series.conf
# (as all other arch specific patches should be kept at the end
# for obvious reasons.)
++++++ supported.conf ++++++
--- kernel-source/supported.conf 2006-05-19 17:51:27.000000000 +0200
+++ kernel-source/supported.conf 2006-05-24 18:53:48.000000000 +0200
@@ -846,12 +846,12 @@
kernel/drivers/message/fusion/mptspi
kernel/drivers/message/fusion/mptsas
kernel/drivers/message/fusion/mptfc
- kernel/drivers/message/i2o/i2o_block
+- kernel/drivers/message/i2o/i2o_block # Unsupported - bug #176735
kernel/drivers/message/i2o/i2o_bus
kernel/drivers/message/i2o/i2o_config
kernel/drivers/message/i2o/i2o_core
kernel/drivers/message/i2o/i2o_proc
- kernel/drivers/message/i2o/i2o_scsi
+- kernel/drivers/message/i2o/i2o_scsi # Unsupported - bug #176735
kernel/drivers/misc/ibmasm/ibmasm # IBM ASM Service Processor Driver
kernel/drivers/mmc/mmc_block
kernel/drivers/mmc/mmc_core
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...