Hello community,
here is the log from the commit of package kernel-source
checked in at Tue May 2 12:13:14 CEST 2006.
--------
--- kernel-source/kernel-bigsmp.changes 2006-04-30 18:26:20.000000000 +0200
+++ STABLE/kernel-source/kernel-bigsmp.changes 2006-05-02 11:24:56.000000000 +0200
@@ -1,0 +2,48 @@
+Tue May 2 10:04:56 CEST 2006 - okir@suse.de
+
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+
+-------------------------------------------------------------------
+Tue May 2 09:29:02 CEST 2006 - okir@suse.de
+
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+
+-------------------------------------------------------------------
+Tue May 2 05:56:15 CEST 2006 - gregkh@suse.de
+
+- Update to 2.6.16.12 which fixed the following:
+ - added for_each_possible_cpu
+ - Alpha: strncpy() fix
+ - Altix snsc: duplicate kobject fix
+ - cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+ - cxusb-bluebird: bug-fix: power down corrupts frontend
+ - dm flush queue EINTR
+ - dm snapshot: fix kcopyd destructor
+ - Fix reiserfs deadlock
+ - fix saa7129 support in saa7127 module for pvr350 tv out
+ - get_dvb_firmware: download nxt2002 firmware from new driver location
+ - i386: fix broken FP exception handling
+ - LSM: add missing hook to do_compat_readv_writev()
+ - make vm86 call audit_syscall_exit
+ - MIPS: Fix branch emulation for floating-point exceptions.
+ - MIPS: Fix tx49_blast_icache32_page_indexed.
+ - MIPS: R2 build fixes for gcc < 3.4.
+ - MIPS: Use "R" constraint for cache_op.
+ - NET: e1000: Update truesize with the length of the packet for packet split
+ - Simplify proc/devices and fix early termination regression
+ - sonypi: correct detection of new ICH7-based laptops
+ - tipar oops fix
+ - USB: fix array overrun in drivers/usb/serial/option.c
+ - x86_64: Fix a race in the free_iommu path.
+ - x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+ - x86/PAE: Fix pte_clear for the >4GB RAM case
+
+-------------------------------------------------------------------
+Mon May 1 10:55:01 CEST 2006 - perex@suse.de
+
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
+
+-------------------------------------------------------------------
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.7eU40Q/_old 2006-05-02 12:08:47.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.16.11)
+# spec file for package kernel-bigsmp (Version 2.6.16.12)
#
# 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.11
-Release: 14
+Version: 2.6.16.12
+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.11-%release
+Provides: kernel = 2.6.16.12-%release
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -114,13 +114,13 @@
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.16.11.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.11.src.rpm."
+ echo "The kernel-bigsmp-2.6.16.12.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.12.src.rpm."
exit 1
fi
symbols=$(
@@ -441,6 +441,42 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
kernel-debug.spec: same change
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:47.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.16.11)
+# spec file for package kernel-dummy (Version 2.6.16.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,8 +16,8 @@
Autoreqprov: off
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
-Version: 2.6.16.11
-Release: 14
+Version: 2.6.16.12
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
@@ -41,6 +41,42 @@
/etc/dummy
%changelog -n kernel-dummy
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:47.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.16.11)
+# spec file for package kernel-iseries64 (Version 2.6.16.12)
#
# 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.11
-Release: 14
+Version: 2.6.16.12
+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.11-%release
+Provides: kernel = 2.6.16.12-%release
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -115,13 +115,13 @@
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.16.11.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.11.src.rpm."
+ echo "The kernel-iseries64-2.6.16.12.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.12.src.rpm."
exit 1
fi
symbols=$(
@@ -442,6 +442,42 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
kernel-kdump.spec: same change
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:48.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.16.11)
+# spec file for package kernel-ppc64 (Version 2.6.16.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,8 +19,8 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.16.11
-Release: 14
+Version: 2.6.16.12
+Release: 1
Summary: Kernel for ppc64 Systems
License: GPL, LGPL
Group: System/Kernel
@@ -28,7 +28,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.11-%release
+Provides: kernel = 2.6.16.12-%release
%endif
%endif
Provides: kernel-ppc64-nongpl
@@ -129,13 +129,13 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.16.11.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.11.src.rpm."
+ echo "The kernel-ppc64-2.6.16.12.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.12.src.rpm."
exit 1
fi
symbols=$(
@@ -456,6 +456,42 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:48.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.16.11)
+# spec file for package kernel-s390 (Version 2.6.16.12)
#
# 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.11
-Release: 14
+Version: 2.6.16.12
+Release: 1
Summary: The Standard Kernel
License: GPL
Group: System/Kernel
@@ -29,7 +29,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.16.11-%release
+Provides: kernel = 2.6.16.12-%release
%endif
%endif
Provides: kernel-s390-nongpl
@@ -112,13 +112,13 @@
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-s390-2.6.16.11.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.11.src.rpm."
+ echo "The kernel-s390-2.6.16.12.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.12.src.rpm."
exit 1
fi
symbols=$(
@@ -439,6 +439,42 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
kernel-smp.spec: same change
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:48.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.16.11)
+# spec file for package kernel-source (Version 2.6.16.12)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,8 +24,8 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
-Version: 2.6.16.11
-Release: 14
+Version: 2.6.16.12
+Release: 1
Source0: 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/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
@@ -117,16 +117,16 @@
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.16.11/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.16.11/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.11/$patch; then
+ > %_builddir/kernel-source-2.6.16.12/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.16.12/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.12/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.11 %release
-KERNELRELEASE=2.6.16.11-%release
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.12 %release
+KERNELRELEASE=2.6.16.12-%release
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.16.11/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.16.11/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.16.12/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.16.12/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -274,6 +274,42 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:48.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.16.11)
+# spec file for package kernel-syms (Version 2.6.16.12)
#
# 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.11
-Release: 14
+Version: 2.6.16.12
+Release: 1
Requires: linux
-Requires: kernel-source = 2.6.16.11-%release
+Requires: kernel-source = 2.6.16.12-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -84,7 +84,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
@@ -128,6 +128,42 @@
/boot/symsets-*-*.tar.gz
%changelog -n kernel-syms
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.7eU40Q/_old 2006-05-02 12:08:49.000000000 +0200
+++ /var/tmp/diff_new_pack.7eU40Q/_new 2006-05-02 12:08:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.16.11)
+# spec file for package kernel-um (Version 2.6.16.12)
#
# 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.11
-Release: 14
+Version: 2.6.16.12
+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.11-%release
+Provides: kernel = 2.6.16.12-%release
%endif
%endif
Provides: kernel-um-nongpl
@@ -115,13 +115,13 @@
-Source Timestamp: 2006/04/30 16:25:09 UTC
+Source Timestamp: 2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
%prep
if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then
- echo "The kernel-um-2.6.16.11.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.16.11.src.rpm."
+ echo "The kernel-um-2.6.16.12.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.16.12.src.rpm."
exit 1
fi
symbols=$(
@@ -442,6 +442,42 @@
%files -f kernel.files
%changelog -n kernel-um
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated
+ returned random garbage.
+* Tue May 02 2006 - okir@suse.de
+- patches.fixes/nfs4-setclientid: NFSv4: SETCLIENTID_CONFIRM
+ should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE (167953).
+* Tue May 02 2006 - gregkh@suse.de
+- Update to 2.6.16.12 which fixed the following:
+- added for_each_possible_cpu
+- Alpha: strncpy() fix
+- Altix snsc: duplicate kobject fix
+- cs5535_gpio.c: call cdev_del() during module_exit to unmap kobject references and other cleanups
+- cxusb-bluebird: bug-fix: power down corrupts frontend
+- dm flush queue EINTR
+- dm snapshot: fix kcopyd destructor
+- Fix reiserfs deadlock
+- fix saa7129 support in saa7127 module for pvr350 tv out
+- get_dvb_firmware: download nxt2002 firmware from new driver location
+- i386: fix broken FP exception handling
+- LSM: add missing hook to do_compat_readv_writev()
+- make vm86 call audit_syscall_exit
+- MIPS: Fix branch emulation for floating-point exceptions.
+- MIPS: Fix tx49_blast_icache32_page_indexed.
+- MIPS: R2 build fixes for gcc < 3.4.
+- MIPS: Use "R" constraint for cache_op.
+- NET: e1000: Update truesize with the length of the packet for packet split
+- Simplify proc/devices and fix early termination regression
+- sonypi: correct detection of new ICH7-based laptops
+- tipar oops fix
+- USB: fix array overrun in drivers/usb/serial/option.c
+- x86_64: Fix a race in the free_iommu path.
+- x86_64: Pass -32 to the assembler when compiling the 32bit vsyscall pages
+- x86/PAE: Fix pte_clear for the >4GB RAM case
+* Mon May 01 2006 - perex@suse.de
+- patches.suse/netfilter-conntrack-sinzero:
+ VUL-0: kernel: minor information leak in SO_ORIGINAL_DST (#159046)
* Sun Apr 30 2006 - agruen@suse.de
- patches.fixes/nfs-acl-caching.diff: Need to update the cached
acls in nfs3_proc_setacls as well (171059).
kernel-xen.spec: same change
kernel-xenpae.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2006-04-30 18:26:14.000000000 +0200
+++ STABLE/kernel-source/build-source-timestamp 2006-05-02 11:24:52.000000000 +0200
@@ -1,2 +1,2 @@
-2006/04/30 16:25:09 UTC
+2006/05/02 08:02:44 UTC
CVS Branch: SL101_BRANCH
++++++ config.tar.bz2 ++++++
++++++ kabi.tar.bz2 ++++++
++++++ minmem ++++++
--- kernel-source/minmem 2006-04-30 20:01:58.000000000 +0200
+++ STABLE/kernel-source/minmem 2006-05-02 11:26:22.000000000 +0200
@@ -1 +1 @@
-514000
+1048576
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-free-iommu-race new/patches.arch/x86_64-free-iommu-race
--- old/patches.arch/x86_64-free-iommu-race 2006-04-21 08:35:38.000000000 +0200
+++ new/patches.arch/x86_64-free-iommu-race 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-Subject: Fix a race in the free_iommu path.
-From: Mike Waychison
-Acked-by: ak@suse.de
-
-We do this by removing a micro-optimization that tries to avoid grabbing
-the iommu_bitmap_lock spinlock and using a bus-locked operation.
-
-This still races with other simultaneous alloc_iommu or free_iommu(size
-> 1) which both use bus-unlocked operations.
-
-The end result of this race is eventually ending
-up with an iommu_gart_bitmap that has bits errornously set all over,
-making large contiguous iommu space allocations fail with 'PCI-DMA:
-Out of IOMMU space'.
-
-Signed-off-by: Mike Waychison
-Signed-off-by: Andi Kleen
-
- arch/x86_64/kernel/pci-gart.c | 4 ----
- 1 files changed, 4 deletions(-)
-
-Index: linux/arch/x86_64/kernel/pci-gart.c
-===================================================================
---- linux.orig/arch/x86_64/kernel/pci-gart.c
-+++ linux/arch/x86_64/kernel/pci-gart.c
-@@ -112,10 +112,6 @@ static unsigned long alloc_iommu(int siz
- static void free_iommu(unsigned long offset, int size)
- {
- unsigned long flags;
-- if (size == 1) {
-- clear_bit(offset, iommu_gart_bitmap);
-- return;
-- }
- spin_lock_irqsave(&iommu_bitmap_lock, flags);
- __clear_bit_string(iommu_gart_bitmap, offset, size);
- spin_unlock_irqrestore(&iommu_bitmap_lock, flags);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86_64-vsyscall32-aflags new/patches.arch/x86_64-vsyscall32-aflags
--- old/patches.arch/x86_64-vsyscall32-aflags 2006-04-21 08:46:41.000000000 +0200
+++ new/patches.arch/x86_64-vsyscall32-aflags 1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-From: ak@suse.de
-Subject: Pass -32 to the assembler when compiling the 32bit vsyscall pages
-References: 163112
-
-This quietens warnings and actually fixes a bug. The unwind tables would
-come out wrong without -32, causing pthread cancellation during them
-to crash in the gcc runtime.
-
-The problem seems to only happen with newer binutils
-(it doesn't happen with 2.16.91.0.2 but happens wit 2.16.91.0.5)
-
-Thanks to Brian Baker @ HP for test case and initial analysis.
-
-Cc: brian.b@hp.com
-
-Signed-off-by: Andi Kleen
-
----
- arch/x86_64/ia32/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: linux/arch/x86_64/ia32/Makefile
-===================================================================
---- linux.orig/arch/x86_64/ia32/Makefile
-+++ linux/arch/x86_64/ia32/Makefile
-@@ -27,5 +27,5 @@ $(obj)/vsyscall-sysenter.so $(obj)/vsysc
- $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
- $(call if_changed,syscall)
-
--AFLAGS_vsyscall-sysenter.o = -m32
--AFLAGS_vsyscall-syscall.o = -m32
-+AFLAGS_vsyscall-sysenter.o = -m32 -Wa,-32
-+AFLAGS_vsyscall-syscall.o = -m32 -Wa,-32
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000-update new/patches.drivers/e1000-update
--- old/patches.drivers/e1000-update 2006-01-20 10:04:43.000000000 +0100
+++ new/patches.drivers/e1000-update 2006-05-02 10:53:42.000000000 +0200
@@ -9,15 +9,13 @@
drivers/net/e1000/e1000_ethtool.c | 112 ++--
drivers/net/e1000/e1000_hw.c | 926 ++++++++++++++++++++++++++++++++------
drivers/net/e1000/e1000_hw.h | 367 ++++++++++++++-
- drivers/net/e1000/e1000_main.c | 694 +++++++++++++---------------
+ drivers/net/e1000/e1000_main.c | 691 +++++++++++++---------------
drivers/net/e1000/e1000_osdep.h | 5
drivers/net/e1000/e1000_param.c | 2
- 7 files changed, 1533 insertions(+), 625 deletions(-)
+ 7 files changed, 1532 insertions(+), 623 deletions(-)
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000.h
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000.h
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000.h
+--- linux-2.6.16.orig/drivers/net/e1000/e1000.h
++++ linux-2.6.16/drivers/net/e1000/e1000.h
@@ -53,8 +53,7 @@
#include
#include
@@ -159,10 +157,8 @@
+#endif
};
#endif /* _E1000_H_ */
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_ethtool.c
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_ethtool.c
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_ethtool.c
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_ethtool.c
++++ linux-2.6.16/drivers/net/e1000/e1000_ethtool.c
@@ -68,7 +68,6 @@ static const struct e1000_stats e1000_gs
{ "rx_over_errors", E1000_STAT(net_stats.rx_over_errors) },
{ "rx_crc_errors", E1000_STAT(net_stats.rx_crc_errors) },
@@ -452,10 +448,8 @@
{
SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
}
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_hw.c
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_hw.c
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_hw.c
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_hw.c
++++ linux-2.6.16/drivers/net/e1000/e1000_hw.c
@@ -68,38 +68,8 @@ static int32_t e1000_polarity_reversal_w
static int32_t e1000_set_phy_mode(struct e1000_hw *hw);
static int32_t e1000_host_if_read_cookie(struct e1000_hw *hw, uint8_t *buffer);
@@ -644,7 +638,7 @@
+ DEBUGFUNC("e1000_copper_link_ggp_setup");
+
+ if(!hw->phy_reset_disable) {
-+
++
+ /* Enable CRS on TX for half-duplex operation. */
+ ret_val = e1000_read_phy_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,
+ &phy_data);
@@ -1058,7 +1052,7 @@
}
}
-+ if ((hw->mac_type == e1000_80003es2lan) &&
++ if ((hw->mac_type == e1000_80003es2lan) &&
+ (hw->media_type == e1000_media_type_copper)) {
+ if (*speed == SPEED_1000)
+ ret_val = e1000_configure_kmrn_for_1000(hw);
@@ -2345,10 +2339,8 @@
fwsm = E1000_READ_REG(hw, FWSM);
if((fwsm & E1000_FWSM_MODE_MASK) != 0)
return TRUE;
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_hw.h
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_hw.h
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_hw.h
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_hw.h
++++ linux-2.6.16/drivers/net/e1000/e1000_hw.h
@@ -60,6 +60,7 @@ typedef enum {
e1000_82571,
e1000_82572,
@@ -2445,7 +2437,7 @@
+int32_t e1000_mng_enable_host_if(struct e1000_hw *hw);
+int32_t e1000_mng_host_if_write(struct e1000_hw *hw, uint8_t *buffer,
+ uint16_t length, uint16_t offset, uint8_t *sum);
-+int32_t e1000_mng_write_cmd_header(struct e1000_hw* hw,
++int32_t e1000_mng_write_cmd_header(struct e1000_hw* hw,
+ struct e1000_host_mng_command_header* hdr);
+
+int32_t e1000_mng_write_commit(struct e1000_hw *hw);
@@ -3018,10 +3010,8 @@
/* Miscellaneous PHY bit definitions. */
#define PHY_PREAMBLE 0xFFFFFFFF
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_main.c
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_main.c
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_main.c
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_main.c
++++ linux-2.6.16/drivers/net/e1000/e1000_main.c
@@ -29,8 +29,14 @@
#include "e1000.h"
@@ -3242,7 +3232,7 @@
!adapter->vlgrp->vlan_devices[old_vid])
e1000_vlan_rx_kill_vid(netdev, old_vid);
- }
-+ } else
++ } else
+ adapter->mng_vlan_id = vid;
}
}
@@ -3323,8 +3313,8 @@
DPRINTK(PROBE, INFO, "PHY reset is blocked due to SOL/IDER session.\n");
+ /* if ksp3, indicate if it's port a being setup */
-+ if (pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 &&
-+ e1000_ksp3_port_a == 0)
++ if (pdev->device == E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3 &&
++ e1000_ksp3_port_a == 0)
+ adapter->ksp3_port_a = 1;
+ e1000_ksp3_port_a++;
+ /* Reset for multiple KP3 adapters */
@@ -3338,7 +3328,7 @@
NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
}
-+
++
#ifdef NETIF_F_TSO
if ((adapter->hw.mac_type >= e1000_82544) &&
@@ -3801,7 +3791,7 @@
+ break;
+ }
+
-+ if ((adapter->hw.mac_type == e1000_82571 ||
++ if ((adapter->hw.mac_type == e1000_82571 ||
+ adapter->hw.mac_type == e1000_82572) &&
+ adapter->txb2b == 0) {
+#define SPEED_MODE_BIT (1 << 21)
@@ -3810,7 +3800,7 @@
+ tarc0 &= ~SPEED_MODE_BIT;
+ E1000_WRITE_REG(&adapter->hw, TARC0, tarc0);
+ }
-+
++
+#ifdef NETIF_F_TSO
+ /* disable TSO for pcie and 10/100 speeds, to avoid
+ * some hardware issues */
@@ -3940,7 +3930,7 @@
if (!__pskb_pull_tail(skb, pull_size)) {
printk(KERN_ERR "__pskb_pull_tail failed.\n");
@@ -2917,6 +2802,10 @@ e1000_xmit_frame(struct sk_buff *skb, st
- return -EFAULT;
+ return NETDEV_TX_OK;
}
len = skb->len - skb->data_len;
+ break;
@@ -4323,7 +4313,7 @@
cleaned = TRUE;
cleaned_count++;
-@@ -3863,23 +3765,49 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
+@@ -3863,6 +3765,35 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
/* Good Receive */
skb_put(skb, length);
@@ -4336,7 +4326,7 @@
+ * throughput, so unsplit small packets and save the alloc/put*/
+ if (l1 && ((length + l1) < E1000_CB_LENGTH)) {
+ u8 *vaddr;
-+ /* there is no documentation about how to call
++ /* there is no documentation about how to call
+ * kmap_atomic, but we can't sleep once kmap_atomic,
+ * so be quick about it */
+ pci_dma_sync_single_for_cpu(pdev,
@@ -4355,12 +4345,11 @@
+ goto copydone;
+ } /* if */
+ }
-+
++
for (j = 0; j < adapter->rx_ps_pages; j++) {
-- if (!(length = le16_to_cpu(rx_desc->wb.upper.length[j])))
-+ if (!(length= le16_to_cpu(rx_desc->wb.upper.length[j])))
+ if (!(length = le16_to_cpu(rx_desc->wb.upper.length[j])))
break;
--
+@@ -3870,17 +3801,15 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
pci_unmap_page(pdev, ps_page_dma->ps_page_dma[j],
PAGE_SIZE, PCI_DMA_FROMDEVICE);
ps_page_dma->ps_page_dma[j] = 0;
@@ -4374,13 +4363,14 @@
- skb_shinfo(skb)->nr_frags++;
skb->len += length;
skb->data_len += length;
+ skb->truesize += length;
}
+copydone:
e1000_rx_checksum(adapter, staterr,
- rx_desc->wb.lower.hi_dword.csum_ip.csum, skb);
+ le16_to_cpu(rx_desc->wb.lower.hi_dword.csum_ip.csum), skb);
skb->protocol = eth_type_trans(skb, netdev);
-@@ -3905,10 +3833,6 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
+@@ -3906,10 +3835,6 @@ e1000_clean_rx_irq_ps(struct e1000_adapt
}
#endif /* CONFIG_E1000_NAPI */
netdev->last_rx = jiffies;
@@ -4390,8 +4380,8 @@
-#endif
next_desc:
- rx_desc->wb.middle.status_error &= ~0xFF;
-@@ -3920,6 +3844,7 @@ next_desc:
+ rx_desc->wb.middle.status_error &= cpu_to_le32(~0xFF);
+@@ -3921,6 +3846,7 @@ next_desc:
cleaned_count = 0;
}
@@ -4399,7 +4389,7 @@
rx_desc = next_rxd;
buffer_info = next_buffer;
-@@ -3963,7 +3888,6 @@ e1000_alloc_rx_buffers(struct e1000_adap
+@@ -3964,7 +3890,6 @@ e1000_alloc_rx_buffers(struct e1000_adap
goto map_skb;
}
@@ -4407,7 +4397,7 @@
if (unlikely(!skb)) {
/* Better luck next round */
adapter->alloc_rx_buff_failed++;
-@@ -4516,8 +4440,8 @@ e1000_set_spd_dplx(struct e1000_adapter
+@@ -4517,8 +4442,8 @@ e1000_set_spd_dplx(struct e1000_adapter
}
#ifdef CONFIG_PM
@@ -4418,7 +4408,7 @@
*/
#define PCIE_CONFIG_SPACE_LEN 256
#define PCI_CONFIG_SPACE_LEN 64
-@@ -4527,6 +4451,7 @@ e1000_pci_save_state(struct e1000_adapte
+@@ -4528,6 +4453,7 @@ e1000_pci_save_state(struct e1000_adapte
struct pci_dev *dev = adapter->pdev;
int size;
int i;
@@ -4426,7 +4416,7 @@
if (adapter->hw.mac_type >= e1000_82571)
size = PCIE_CONFIG_SPACE_LEN;
else
-@@ -4550,8 +4475,10 @@ e1000_pci_restore_state(struct e1000_ada
+@@ -4551,8 +4477,10 @@ e1000_pci_restore_state(struct e1000_ada
struct pci_dev *dev = adapter->pdev;
int size;
int i;
@@ -4437,7 +4427,7 @@
if (adapter->hw.mac_type >= e1000_82571)
size = PCIE_CONFIG_SPACE_LEN;
else
-@@ -4564,6 +4491,24 @@ e1000_pci_restore_state(struct e1000_ada
+@@ -4565,6 +4493,24 @@ e1000_pci_restore_state(struct e1000_ada
}
#endif /* CONFIG_PM */
@@ -4462,7 +4452,7 @@
static int
e1000_suspend(struct pci_dev *pdev, pm_message_t state)
{
-@@ -4579,8 +4524,8 @@ e1000_suspend(struct pci_dev *pdev, pm_m
+@@ -4580,8 +4526,8 @@ e1000_suspend(struct pci_dev *pdev, pm_m
e1000_down(adapter);
#ifdef CONFIG_PM
@@ -4473,7 +4463,7 @@
retval = e1000_pci_save_state(adapter);
if (retval)
return retval;
-@@ -4637,7 +4582,7 @@ e1000_suspend(struct pci_dev *pdev, pm_m
+@@ -4638,7 +4584,7 @@ e1000_suspend(struct pci_dev *pdev, pm_m
retval = pci_enable_wake(pdev, PCI_D3hot, 0);
if (retval)
DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");
@@ -4482,7 +4472,7 @@
if (retval)
DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");
}
-@@ -4653,7 +4598,8 @@ e1000_suspend(struct pci_dev *pdev, pm_m
+@@ -4654,7 +4600,8 @@ e1000_suspend(struct pci_dev *pdev, pm_m
DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");
retval = pci_enable_wake(pdev, PCI_D3cold, 1);
if (retval)
@@ -4492,10 +4482,8 @@
}
}
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_osdep.h
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_osdep.h
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_osdep.h
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_osdep.h
++++ linux-2.6.16/drivers/net/e1000/e1000_osdep.h
@@ -41,6 +41,7 @@
#include
#include
@@ -4520,10 +4508,8 @@
+
#endif /* _E1000_OSDEP_H_ */
-Index: linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_param.c
-===================================================================
---- linux-2.6.16-rc1-git3-e1000.orig/drivers/net/e1000/e1000_param.c
-+++ linux-2.6.16-rc1-git3-e1000/drivers/net/e1000/e1000_param.c
+--- linux-2.6.16.orig/drivers/net/e1000/e1000_param.c
++++ linux-2.6.16/drivers/net/e1000/e1000_param.c
@@ -268,7 +268,7 @@ e1000_validate_option(int *value, struct
BUG();
}
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs4-open-delegated new/patches.fixes/nfs4-open-delegated
--- old/patches.fixes/nfs4-open-delegated 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/nfs4-open-delegated 2006-05-02 10:02:44.000000000 +0200
@@ -0,0 +1,26 @@
+From: mainline
+Subject: [NFSv4] nfs4_open_delegated returned random garbage
+Patch-mainline: 2.6.17
+
+When _nfs4_open_delegated fails with an error, nfs4_open_delegated
+will return a random pointer rather than an error.
+
+Acked-by: okir@suse.de
+Acked-by: ak@suse.de
+
+ fs/nfs/nfs4proc.c | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: build/fs/nfs/nfs4proc.c
+===================================================================
+--- build.orig/fs/nfs/nfs4proc.c
++++ build/fs/nfs/nfs4proc.c
+@@ -908,7 +908,7 @@ out_put_state_owner:
+ static struct nfs4_state *nfs4_open_delegated(struct inode *inode, int flags, struct rpc_cred *cred)
+ {
+ struct nfs4_exception exception = { };
+- struct nfs4_state *res;
++ struct nfs4_state *res = ERR_PTR(-EIO);
+ int err;
+
+ do {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfs4-setclientid new/patches.fixes/nfs4-setclientid
--- old/patches.fixes/nfs4-setclientid 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/nfs4-setclientid 2006-05-02 09:24:23.000000000 +0200
@@ -0,0 +1,65 @@
+From: Trond Myklebust
+Subject: NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE
+Patch-mainline: 2.6.17
+References: 167953
+
+Signed-off-by: Trond Myklebust
+Acked-by: okir@suse.de
+Acked-by: nfbrown@novell.com
+---
+
+ fs/nfs/nfs4proc.c | 21 +++++++++++++++++++--
+ fs/nfs/nfs4state.c | 1 +
+ 2 files changed, 20 insertions(+), 2 deletions(-)
+
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index 62aed07..3100032 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -2849,8 +2849,7 @@ int nfs4_proc_setclientid(struct nfs4_cl
+ return status;
+ }
+
+-int
+-nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
++static int _nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
+ {
+ struct nfs_fsinfo fsinfo;
+ struct rpc_message msg = {
+@@ -2874,6 +2873,24 @@ nfs4_proc_setclientid_confirm(struct nfs
+ return status;
+ }
+
++int nfs4_proc_setclientid_confirm(struct nfs4_client *clp, struct rpc_cred *cred)
++{
++ long timeout;
++ int err;
++ do {
++ err = _nfs4_proc_setclientid_confirm(clp, cred);
++ switch (err) {
++ case 0:
++ return err;
++ case -NFS4ERR_RESOURCE:
++ /* The IBM lawyers misread another document! */
++ case -NFS4ERR_DELAY:
++ err = nfs4_delay(clp->cl_rpcclient, &timeout);
++ }
++ } while (err == 0);
++ return err;
++}
++
+ struct nfs4_delegreturndata {
+ struct nfs4_delegreturnargs args;
+ struct nfs4_delegreturnres res;
+diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
+index afad025..96e5b82 100644
+--- a/fs/nfs/nfs4state.c
++++ b/fs/nfs/nfs4state.c
+@@ -977,6 +977,7 @@ out:
+ out_error:
+ printk(KERN_WARNING "Error: state recovery failed on NFSv4 server %u.%u.%u.%u with error %d\n",
+ NIPQUAD(clp->cl_addr.s_addr), -status);
++ set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
+ goto out;
+ }
+
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 8748 lines of diff (skipped)
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/netfilter-conntrack-sinzero new/patches.suse/netfilter-conntrack-sinzero
--- old/patches.suse/netfilter-conntrack-sinzero 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/netfilter-conntrack-sinzero 2006-05-01 11:00:09.000000000 +0200
@@ -0,0 +1,42 @@
+From: Pavel Kankovsky
+Subject: BUG: Small information leak in SO_ORIGINAL_DST (2.4 and 2.6)
+References: 159046
+
+It appears sockaddr_in.sin_zero is not zeroed during certain operations
+returning IPv4 socket names, namely:
+
+- getsockopt(...SO_ORIGINAL_DST...) (2.4 and 2.6)
+ see getorigdst() in net/ipv4/netfilter/ip_conntrack_core.c
+ (+ in net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c in 2.6?!)
+
+- getsockname() and getpeername() (and accept()) (2.4 only)
+ see inet_getname() in net/ipv4/af_inet.c
+
+and several unitialized bytes of kernel stack (sizeof(sin_zero) == 6
+to be precise) leak to the userspace.
+
+This *might* have some security ramification.
+
+Acked-by: Olaf Kirch
+Acked-by: Jaroslav Kysela
+
+--- linux-2.6.13.orig/net/ipv4/netfilter/ip_conntrack_core.c 2005-08-29 01:41:01.000000000 +0200
++++ linux-2.6.13-SL100_BRANCH/net/ipv4/netfilter/ip_conntrack_core.c 2006-05-01 10:17:56.091996303 +0200
+@@ -1059,6 +1059,7 @@ getorigdst(struct sock *sk, int optval,
+ .tuple.dst.u.tcp.port;
+ sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
+ .tuple.dst.ip;
++ memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
+
+ DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
+ NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
+--- linux-2.6.16.orig/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2006-03-20 06:53:29.000000000 +0100
++++ linux-2.6.16-SL101_BRANCH/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2006-05-01 10:51:30.346200100 +0200
+@@ -354,6 +354,7 @@
+ .tuple.dst.u.tcp.port;
+ sin.sin_addr.s_addr = ct->tuplehash[IP_CT_DIR_ORIGINAL]
+ .tuple.dst.u3.ip;
++ memset(sin.sin_zero, 0, sizeof(sin.sin_zero));
+
+ DEBUGP("SO_ORIGINAL_DST: %u.%u.%u.%u %u\n",
+ NIPQUAD(sin.sin_addr.s_addr), ntohs(sin.sin_port));
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/xen3-auto-arch-i386.diff new/patches.xen/xen3-auto-arch-i386.diff
--- old/patches.xen/xen3-auto-arch-i386.diff 2006-04-25 18:22:49.000000000 +0200
+++ new/patches.xen/xen3-auto-arch-i386.diff 2006-05-02 10:53:55.000000000 +0200
@@ -1,12 +1,37 @@
Subject: xen3 arch-i386
From: jbeulich@novell.com
-autogenerated from http://xenbits.xensource.com/xen-3.0-testing.hg (tip 9629)
+autogenerated from http://xenbits.xensource.com/xen-3.0-testing.hg (tip 9646)
-Index: head-2006-04-20/arch/i386/kernel/acpi/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/acpi/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/acpi/Makefile 2006-04-20 10:08:54.000000000 +0200
+ arch/i386/Makefile | 23 +++++++++
+ arch/i386/kernel/Makefile | 32 +++++++++++--
+ arch/i386/kernel/acpi/Makefile | 4 +
+ arch/i386/kernel/asm-offsets.c | 5 +-
+ arch/i386/kernel/cpu/Makefile | 5 ++
+ arch/i386/kernel/cpu/mtrr/Makefile | 7 ++
+ arch/i386/kernel/smpalts.c | 85 ++++++++++++++++++++++++++++++++++
+ arch/i386/kernel/smpboot.c | 10 ++++
+ arch/i386/kernel/sysenter.c | 90 ++++++++++++++++++++++++++++++++-----
+ arch/i386/kernel/vm86.c | 8 +++
+ arch/i386/kernel/vmlinux.lds.S | 7 ++
+ arch/i386/kernel/vsyscall.S | 2
+ arch/i386/mm/Makefile | 8 +++
+ arch/i386/pci/Makefile | 9 +++
+ arch/i386/power/Makefile | 4 +
+ include/asm-i386/a.out.h | 2
+ include/asm-i386/apic.h | 2
+ include/asm-i386/atomic.h | 7 --
+ include/asm-i386/bitops.h | 19 ++-----
+ include/asm-i386/elf.h | 7 ++
+ include/asm-i386/futex.h | 4 -
+ include/asm-i386/rwsem.h | 17 +++---
+ include/asm-i386/smp_alt.h | 32 +++++++++++++
+ include/asm-i386/spinlock.h | 39 +++++++++++++---
+ include/asm-i386/system.h | 56 ++++++++++++++++++++---
+ 25 files changed, 425 insertions(+), 59 deletions(-)
+
+--- linux-2.6.16.orig/arch/i386/kernel/acpi/Makefile
++++ linux-2.6.16/arch/i386/kernel/acpi/Makefile
@@ -6,3 +6,7 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += cstate.o processor.o
endif
@@ -15,10 +40,8 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-Index: head-2006-04-20/arch/i386/kernel/asm-offsets.c
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/asm-offsets.c 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/asm-offsets.c 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/asm-offsets.c
++++ linux-2.6.16/arch/i386/kernel/asm-offsets.c
@@ -13,6 +13,7 @@
#include
#include
@@ -41,10 +64,8 @@
- DEFINE(VSYSCALL_BASE, __fix_to_virt(FIX_VSYSCALL));
+ DEFINE(VSYSCALL_BASE, VSYSCALL_BASE);
}
-Index: head-2006-04-20/arch/i386/kernel/cpu/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/cpu/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/cpu/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/Makefile
++++ linux-2.6.16/arch/i386/kernel/cpu/Makefile
@@ -17,3 +17,8 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
@@ -54,10 +75,8 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y), $(src))
+endif
-Index: head-2006-04-20/arch/i386/kernel/cpu/mtrr/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/cpu/mtrr/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/cpu/mtrr/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/cpu/mtrr/Makefile
++++ linux-2.6.16/arch/i386/kernel/cpu/mtrr/Makefile
@@ -3,3 +3,10 @@ obj-y += amd.o
obj-y += cyrix.o
obj-y += centaur.o
@@ -69,10 +88,8 @@
+obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2006-04-20/arch/i386/kernel/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/Makefile
++++ linux-2.6.16/arch/i386/kernel/Makefile
@@ -37,17 +37,26 @@ obj-$(CONFIG_EFI) += efi.o efi_stub.o
obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
obj-$(CONFIG_VM86) += vm86.o
@@ -132,10 +149,8 @@
+obj-y := $(call cherrypickxen, $(obj-y))
+extra-y := $(call cherrypickxen, $(extra-y))
+endif
-Index: head-2006-04-20/arch/i386/kernel/smpalts.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-04-20/arch/i386/kernel/smpalts.c 2006-04-20 10:08:54.000000000 +0200
+--- /dev/null
++++ linux-2.6.16/arch/i386/kernel/smpalts.c
@@ -0,0 +1,85 @@
+#include
+#include
@@ -222,10 +237,8 @@
+ asm volatile ("jmp 1f\n1:");
+ mb();
+}
-Index: head-2006-04-20/arch/i386/kernel/smpboot.c
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/smpboot.c 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/smpboot.c 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/smpboot.c
++++ linux-2.6.16/arch/i386/kernel/smpboot.c
@@ -1250,6 +1250,11 @@ static void __init smp_boot_cpus(unsigne
if (max_cpus <= cpucount+1)
continue;
@@ -250,10 +263,8 @@
local_irq_enable();
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
/* Unleash the CPU! */
-Index: head-2006-04-20/arch/i386/kernel/sysenter.c
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/sysenter.c 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/sysenter.c 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/sysenter.c
++++ linux-2.6.16/arch/i386/kernel/sysenter.c
@@ -13,6 +13,7 @@
#include
#include
@@ -379,11 +390,9 @@
+{
+ return 0;
+}
-Index: head-2006-04-20/arch/i386/kernel/vm86.c
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/vm86.c 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/vm86.c 2006-04-20 10:08:54.000000000 +0200
-@@ -97,7 +97,9 @@
+--- linux-2.6.16.orig/arch/i386/kernel/vm86.c
++++ linux-2.6.16/arch/i386/kernel/vm86.c
+@@ -98,7 +98,9 @@
struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
{
@@ -393,7 +402,7 @@
struct pt_regs *ret;
unsigned long tmp;
-@@ -122,7 +124,9 @@ struct pt_regs * fastcall save_v86_state
+@@ -123,7 +125,9 @@ struct pt_regs * fastcall save_v86_state
do_exit(SIGSEGV);
}
@@ -403,17 +412,17 @@
current->thread.esp0 = current->thread.saved_esp0;
current->thread.sysenter_cs = __KERNEL_CS;
load_esp0(tss, ¤t->thread);
-@@ -251,7 +255,9 @@ out:
+@@ -252,7 +256,9 @@ out:
static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk)
{
+#ifndef CONFIG_X86_NO_TSS
struct tss_struct *tss;
+#endif
+ long eax;
/*
* make sure the vm86() system call doesn't try to do anything silly
- */
-@@ -295,7 +301,9 @@ static void do_sys_vm86(struct kernel_vm
+@@ -297,7 +303,9 @@ static void do_sys_vm86(struct kernel_vm
savesegment(fs, tsk->thread.saved_fs);
savesegment(gs, tsk->thread.saved_gs);
@@ -423,10 +432,8 @@
tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
if (cpu_has_sep)
tsk->thread.sysenter_cs = 0;
-Index: head-2006-04-20/arch/i386/kernel/vmlinux.lds.S
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/vmlinux.lds.S 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/vmlinux.lds.S 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/vmlinux.lds.S
++++ linux-2.6.16/arch/i386/kernel/vmlinux.lds.S
@@ -35,6 +35,13 @@ SECTIONS
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) }
__stop___ex_table = .;
@@ -441,10 +448,8 @@
RODATA
/* writeable */
-Index: head-2006-04-20/arch/i386/kernel/vsyscall.S
-===================================================================
---- head-2006-04-20.orig/arch/i386/kernel/vsyscall.S 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/kernel/vsyscall.S 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/kernel/vsyscall.S
++++ linux-2.6.16/arch/i386/kernel/vsyscall.S
@@ -7,9 +7,11 @@ vsyscall_int80_start:
.incbin "arch/i386/kernel/vsyscall-int80.so"
vsyscall_int80_end:
@@ -457,10 +462,8 @@
+#endif
__FINIT
-Index: head-2006-04-20/arch/i386/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/Makefile
++++ linux-2.6.16/arch/i386/Makefile
@@ -45,6 +45,11 @@ CFLAGS += $(shell if [ $(call cc-vers
CFLAGS += $(cflags-y)
@@ -512,10 +515,8 @@
archclean:
$(Q)$(MAKE) $(clean)=arch/i386/boot
-Index: head-2006-04-20/arch/i386/mm/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/mm/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/mm/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/mm/Makefile
++++ linux-2.6.16/arch/i386/mm/Makefile
@@ -8,3 +8,11 @@ obj-$(CONFIG_NUMA) += discontig.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_HIGHMEM) += highmem.o
@@ -528,10 +529,8 @@
+
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2006-04-20/arch/i386/pci/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/pci/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/pci/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/pci/Makefile
++++ linux-2.6.16/arch/i386/pci/Makefile
@@ -4,6 +4,10 @@ obj-$(CONFIG_PCI_BIOS) += pcbios.o
obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o
obj-$(CONFIG_PCI_DIRECT) += direct.o
@@ -552,20 +551,16 @@
+include $(srctree)/scripts/Makefile.xen
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
-Index: head-2006-04-20/arch/i386/power/Makefile
-===================================================================
---- head-2006-04-20.orig/arch/i386/power/Makefile 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/arch/i386/power/Makefile 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/arch/i386/power/Makefile
++++ linux-2.6.16/arch/i386/power/Makefile
@@ -1,2 +1,4 @@
-obj-$(CONFIG_PM) += cpu.o
+obj-$(CONFIG_PM_LEGACY) += cpu.o
+obj-$(CONFIG_SOFTWARE_SUSPEND) += cpu.o
+obj-$(CONFIG_ACPI_SLEEP) += cpu.o
obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
-Index: head-2006-04-20/include/asm-i386/a.out.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/a.out.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/a.out.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/a.out.h
++++ linux-2.6.16/include/asm-i386/a.out.h
@@ -19,7 +19,7 @@ struct exec
#ifdef __KERNEL__
@@ -575,10 +570,8 @@
#endif
-Index: head-2006-04-20/include/asm-i386/apic.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/apic.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/apic.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/apic.h
++++ linux-2.6.16/include/asm-i386/apic.h
@@ -132,10 +132,12 @@ extern unsigned int nmi_watchdog;
extern int disable_timer_pin_1;
@@ -592,10 +585,8 @@
extern int timer_over_8254;
-Index: head-2006-04-20/include/asm-i386/atomic.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/atomic.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/atomic.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/atomic.h
++++ linux-2.6.16/include/asm-i386/atomic.h
@@ -4,18 +4,13 @@
#include
#include
@@ -616,10 +607,8 @@
/*
* Make sure gcc doesn't try to be clever and move things around
* on us. We need to use _exactly_ the address the user gave us,
-Index: head-2006-04-20/include/asm-i386/bitops.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/bitops.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/bitops.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/bitops.h
++++ linux-2.6.16/include/asm-i386/bitops.h
@@ -7,6 +7,7 @@
#include
@@ -695,10 +684,8 @@
"btcl %2,%1\n\tsbbl %0,%0"
:"=r" (oldbit),"+m" (ADDR)
:"Ir" (nr) : "memory");
-Index: head-2006-04-20/include/asm-i386/elf.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/elf.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/elf.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/elf.h
++++ linux-2.6.16/include/asm-i386/elf.h
@@ -129,11 +129,16 @@ extern int dump_task_extended_fpu (struc
#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
#define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
@@ -717,10 +704,8 @@
#define ARCH_DLINFO \
do { \
NEW_AUX_ENT(AT_SYSINFO, VSYSCALL_ENTRY); \
-Index: head-2006-04-20/include/asm-i386/futex.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/futex.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/futex.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/futex.h
++++ linux-2.6.16/include/asm-i386/futex.h
@@ -28,7 +28,7 @@
"1: movl %2, %0\n\
movl %0, %3\n" \
@@ -739,10 +724,8 @@
oldval, uaddr, oparg);
break;
case FUTEX_OP_OR:
-Index: head-2006-04-20/include/asm-i386/rwsem.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/rwsem.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/rwsem.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/rwsem.h
++++ linux-2.6.16/include/asm-i386/rwsem.h
@@ -40,6 +40,7 @@
#include
@@ -823,10 +806,8 @@
: "+r"(tmp), "=m"(sem->count)
: "r"(sem), "m"(sem->count)
: "memory");
-Index: head-2006-04-20/include/asm-i386/smp_alt.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ head-2006-04-20/include/asm-i386/smp_alt.h 2006-04-20 10:08:54.000000000 +0200
+--- /dev/null
++++ linux-2.6.16/include/asm-i386/smp_alt.h
@@ -0,0 +1,32 @@
+#ifndef __ASM_SMP_ALT_H__
+#define __ASM_SMP_ALT_H__
@@ -860,10 +841,8 @@
+#endif
+
+#endif /* __ASM_SMP_ALT_H__ */
-Index: head-2006-04-20/include/asm-i386/spinlock.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/spinlock.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/spinlock.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/spinlock.h
++++ linux-2.6.16/include/asm-i386/spinlock.h
@@ -6,6 +6,7 @@
#include
#include
@@ -946,10 +925,8 @@
: "=m" (rw->lock) : : "memory");
}
-Index: head-2006-04-20/include/asm-i386/system.h
-===================================================================
---- head-2006-04-20.orig/include/asm-i386/system.h 2006-04-20 10:04:21.000000000 +0200
-+++ head-2006-04-20/include/asm-i386/system.h 2006-04-20 10:08:54.000000000 +0200
+--- linux-2.6.16.orig/include/asm-i386/system.h
++++ linux-2.6.16/include/asm-i386/system.h
@@ -5,7 +5,7 @@
#include
#include
++++++ series.conf ++++++
--- kernel-source/series.conf 2006-04-30 18:26:15.000000000 +0200
+++ STABLE/kernel-source/series.conf 2006-05-02 11:24:57.000000000 +0200
@@ -21,7 +21,7 @@
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
- patches.kernel.org/patch-2.6.16.11
+ patches.kernel.org/patch-2.6.16.12
patches.fixes/setuid-dumpable-wrongdir
patches.fixes/git-kbuild.patch
@@ -107,8 +107,6 @@
patches.arch/x86_64-hpet-drift
patches.arch/x86_64-sync-rdtsc
patches.arch/x86_64-increase-nodemap
- patches.arch/x86_64-free-iommu-race
- patches.arch/x86_64-vsyscall32-aflags
# for i386/x86-64
patches.arch/tune-generic
@@ -282,6 +280,8 @@
patches.fixes/sunrpc-restart-delay-fix
patches.fixes/nfs-utime-flush
patches.fixes/nfs-getxattr-length.diff
+ patches.fixes/nfs4-setclientid
+ patches.fixes/nfs4-open-delegated
########################################################
# lockd + statd
@@ -388,6 +388,7 @@
+perex patches.suse/netfilter-hooks-checksum
patches.suse/netfilter-ipv4options
+ patches.suse/netfilter-conntrack-sinzero
########################################################
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...