Hello community,
here is the log from the commit of package kernel-source
checked in at Thu Oct 11 21:23:56 CEST 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-10-06 08:30:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-10-11 20:02:43.000000000 +0200
@@ -1,0 +2,71 @@
+Thu Oct 11 13:57:42 CEST 2007 - kkeil@suse.de
+
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+
+-------------------------------------------------------------------
+Wed Oct 10 20:32:58 CEST 2007 - gregkh@suse.de
+
+- refresh patches to apply cleanly to 2.6.22.10
+
+-------------------------------------------------------------------
+Wed Oct 10 20:22:29 CEST 2007 - gregkh@suse.de
+
+- Update to final version of 2.6.22.10
+
+-------------------------------------------------------------------
+Wed Oct 10 19:48:42 CEST 2007 - jack@suse.cz
+
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+
+-------------------------------------------------------------------
+Wed Oct 10 19:14:15 CEST 2007 - sdietrich@suse.de
+
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+
+-------------------------------------------------------------------
+Tue Oct 9 21:03:03 CEST 2007 - gregkh@suse.de
+
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+
+-------------------------------------------------------------------
+Tue Oct 9 20:11:48 CEST 2007 - gregkh@suse.de
+
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+
+-------------------------------------------------------------------
+Tue Oct 9 18:19:45 CEST 2007 - jack@suse.cz
+
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+
+-------------------------------------------------------------------
+Mon Oct 8 17:22:27 CEST 2007 - jbeulich@novell.com
+
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:54.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.22.9)
+# spec file for package kernel-bigsmp (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: Kernel with PAE Support
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
Provides: k_smp4G
@@ -169,12 +169,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-bigsmp-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -262,8 +262,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -556,6 +556,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:55.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.22.9)
+# spec file for package kernel-debug (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: A Debug Version of the Kernel
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch %ix86
@@ -174,12 +174,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-debug-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-debug-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -267,8 +267,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -561,6 +561,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:55.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.22.9)
+# spec file for package kernel-default (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch alpha
@@ -195,12 +195,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-default-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-default-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -288,8 +288,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -582,6 +582,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:55.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.22.9)
+# spec file for package kernel-dummy (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,8 +14,8 @@
Name: kernel-dummy
Url: http://www.kernel.org/
Summary: Internal dummy package for synchronizing release numbers
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%install
rm -rf %buildroot
@@ -39,6 +39,50 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:55.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.22.9)
+# spec file for package kernel-kdump (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: kernel for kdump
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch ppc
@@ -173,12 +173,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-kdump-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -266,8 +266,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -560,6 +560,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:55.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.22.9)
+# spec file for package kernel-ppc64 (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -37,8 +37,8 @@
%define build_vanilla 1
%endif
Summary: Kernel for ppc64 Systems
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later; LGPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -93,7 +93,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch ppc
@@ -185,12 +185,12 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-ppc64-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -278,8 +278,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -572,6 +572,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-rt_debug.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-rt_debug (Version 2.6.22.9)
+# spec file for package kernel-rt_debug (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: A Debug Version of the Kernel
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch %ix86
@@ -171,12 +171,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-rt_debug-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-rt_debug-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -264,8 +264,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -558,6 +558,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-rt.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-rt (Version 2.6.22.9)
+# spec file for package kernel-rt (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Realtime Linux Kernel
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch %ix86
@@ -187,12 +187,12 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-rt-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-rt-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -280,8 +280,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -574,6 +574,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.22.9)
+# spec file for package kernel-s390 (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel
-Version: 2.6.22.9
-Release: 3
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
Provides: kernel-32bit k_deflt
@@ -167,12 +167,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-s390-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-s390-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -260,8 +260,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -554,6 +554,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.22.9)
+# spec file for package kernel-source (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
%define source_rel %release
%endif
Summary: The Linux Kernel Sources
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -31,7 +31,7 @@
BuildRequires: kernel-dummy
%endif
Provides: linux
-Provides: kernel-source = 2.6.22.9-%source_rel
+Provides: kernel-source = 2.6.22.10-%source_rel
%if "kernel-source" == "kernel-source"
Provides: linux lx_suse lx_sus22 lx_sus24
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
@@ -105,7 +105,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -127,15 +127,15 @@
chmod -Rf a+rX,g-w,o-w .
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.22.9/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.22.9/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22.9/$patch; then
+ > %_builddir/kernel-source-2.6.22.10/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.22.10/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22.10/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22.9 %source_rel
-KERNELRELEASE=2.6.22.9-%source_rel
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22.10 %source_rel
+KERNELRELEASE=2.6.22.10-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.22.9/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.22.9/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.22.10/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.22.10/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -277,6 +277,50 @@
%files -f kernel-source.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:56.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.22.9)
+# spec file for package kernel-syms (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -20,8 +20,8 @@
%define source_rel %release
%endif
Summary: Kernel Symbol Versions (modversions)
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: Development/Sources
AutoReqProv: off
@@ -64,7 +64,7 @@
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
Requires: linux
-Requires: kernel-source = 2.6.22.9-%source_rel
+Requires: kernel-source = 2.6.22.10-%source_rel
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -95,7 +95,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -149,6 +149,50 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:57.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.22.9)
+# spec file for package kernel-vanilla (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Standard Kernel - without any SUSE patches
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch alpha
@@ -187,12 +187,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-vanilla-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -280,8 +280,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -574,6 +574,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:57.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xenpae (Version 2.6.22.9)
+# spec file for package kernel-xenpae (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Xen Kernel with PAE support
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2
@@ -170,12 +170,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-xenpae-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-xenpae-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -263,8 +263,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -557,6 +557,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.sz4357/_old 2007-10-11 21:20:57.000000000 +0200
+++ /var/tmp/diff_new_pack.sz4357/_new 2007-10-11 21:20:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xen (Version 2.6.22.9)
+# spec file for package kernel-xen (Version 2.6.22.10)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -38,8 +38,8 @@
%define build_vanilla 1
%endif
Summary: The Xen Kernel
-Version: 2.6.22.9
-Release: 4
+Version: 2.6.22.10
+Release: 1
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -94,7 +94,7 @@
#Conflicts: kernel
%else
%if ! %build_xen
-Provides: kernel = 2.6.22.9-%source_rel
+Provides: kernel = 2.6.22.10-%source_rel
%endif
%endif
%ifarch %ix86
@@ -173,12 +173,12 @@
-Source Timestamp: 2007/10/05 21:32:04 UTC
+Source Timestamp: 2007/10/11 11:59:04 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-xen-2.6.22.9.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.9.src.rpm."
+ echo "The kernel-xen-2.6.22.10.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.10.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -266,8 +266,8 @@
%endif
make prepare $MAKE_ARGS
KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
-if [ 2.6.22.9-%source_rel != ${KERNELRELEASE%%-*} ]; then
- echo "Kernel release mismatch: 2.6.22.9-%source_rel" \
+if [ 2.6.22.10-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.10-%source_rel" \
"!= ${KERNELRELEASE%%-*}" >&2
exit 1
fi
@@ -560,6 +560,50 @@
%files -f kernel.files
%changelog
+* Thu Oct 11 2007 - kkeil@suse.de
+- patches.fixes/natsemi_removal.fix: Fix device removal bug(332612)
+* Wed Oct 10 2007 - gregkh@suse.de
+- refresh patches to apply cleanly to 2.6.22.10
+* Wed Oct 10 2007 - gregkh@suse.de
+- Update to final version of 2.6.22.10
+* Wed Oct 10 2007 - jack@suse.cz
+- patches.suse/ocfs2-15-fix-heartbeat-write.diff: Fix heartbeat
+ block writing (300730).
+* Wed Oct 10 2007 - sdietrich@suse.de
+- patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list:
+ Fix improperly terminated array.
+* Tue Oct 09 2007 - gregkh@suse.de
+- get rt patchset to apply again after 2.6.22.10-rc1 patch
+* Tue Oct 09 2007 - gregkh@suse.de
+- Update to 2.6.22.10-rc1
+ - bug fixes we already have in our tree, which removed:
+ - patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
+ - patches.fixes/sky2-tx-sum-resume.patch: Delete.
+ - SATA device quirk updates
+ - sky2 bugfixes
+ - selinux security fix
+ - i2c bugfix
+ - ppp_mppe stack usage fix
+ - scsi transport bugfix
+ - shutdown bugfix
+ - timer_stats bugfix
+* Tue Oct 09 2007 - jack@suse.cz
+- patches.suse/ocfs2-14-fix-notifier-hang.diff: Fix kernel hang
+ during cluster initialization (300730).
+* Mon Oct 08 2007 - jbeulich@novell.com
+- patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding:
+ Delete.
+- patches.xen/xen3-patch-2.6.22.5-6: Linux 2.6.22.6.
+- patches.xen/xen3-patch-2.6.22.6-7: Linux 2.6.22.7.
+- patches.xen/xen3-aux-at_vector_size.patch: Xen version of
+ patches.fixes/aux-at_vector_size.patch (310037).
+- patches.xen/xen3-auto-common.diff,
+- patches.xen/xen3-auto-xen-kconfig.diff,
+ patches.xen/softlockup-no-idle-hz.patch,
+ patches.xen/30-bit-field-booleans.patch,
+ patches.xen/xen3-patch-2.6.19,
+ patches.xen/xen-x86-consistent-nmi,
+ patches.xen/xen-x86-no-lapic: Refresh.
* Fri Oct 05 2007 - bwalle@suse.de
- patches.suse/kabi-safe-2.6.22.6-tcp_sendmsg:
Add trampoline function also for IPv6 and fix kernel hang
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-10-06 08:30:18.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-10-11 20:02:38.000000000 +0200
@@ -1 +1 @@
-2007/10/05 21:32:04 UTC
+2007/10/11 11:59:04 UTC
++++++ config.tar.bz2 ++++++
++++++ kabi.tar.bz2 ++++++
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2007-10-08 12:26:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-10-11 20:02:57.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-create.diff new/patches.apparmor/security-create.diff
--- old/patches.apparmor/security-create.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-create.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 3 ++-
4 files changed, 10 insertions(+), 6 deletions(-)
---- a/fs/namei.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:40.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -1521,7 +1521,7 @@ int vfs_create(struct inode *dir, struct
return -EACCES; /* shouldn't it be ENOSYS? */
mode &= S_IALLUGO;
@@ -25,8 +25,8 @@
if (error)
return error;
DQUOT_INIT(dir);
---- a/include/linux/security.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:39.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -283,6 +283,7 @@ struct request_sock;
* Check permission to create a regular file.
* @dir contains inode structure of the parent of the new file.
@@ -68,8 +68,8 @@
int mode)
{
return 0;
---- a/security/dummy.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:39.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -265,7 +265,7 @@ static int dummy_inode_init_security (st
}
@@ -79,9 +79,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:39.000000000 -0400
-@@ -2176,7 +2176,8 @@ static int selinux_inode_init_security(s
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2179,7 +2179,8 @@ static int selinux_inode_init_security(s
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-getxattr.diff new/patches.apparmor/security-getxattr.diff
--- old/patches.apparmor/security-getxattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-getxattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 3 ++-
4 files changed, 13 insertions(+), 8 deletions(-)
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -116,7 +116,7 @@ vfs_getxattr(struct dentry *dentry, stru
if (error)
return error;
@@ -25,8 +25,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -391,7 +391,7 @@ struct request_sock;
* @value identified by @name for @dentry and @mnt.
* @inode_getxattr:
@@ -71,8 +71,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -368,7 +368,8 @@ static void dummy_inode_post_setxattr (s
{
}
@@ -83,9 +83,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:32.000000000 -0400
-@@ -2393,7 +2393,8 @@ static void selinux_inode_post_setxattr(
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2396,7 +2396,8 @@ static void selinux_inode_post_setxattr(
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-link.diff new/patches.apparmor/security-link.diff
--- old/patches.apparmor/security-link.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-link.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 9 +++++++--
4 files changed, 26 insertions(+), 10 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:36.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -2293,7 +2293,8 @@ int vfs_link(struct dentry *old_dentry,
if (S_ISDIR(old_dentry->d_inode->i_mode))
return -EPERM;
@@ -26,8 +26,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:36.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -289,8 +289,10 @@ struct request_sock;
* @inode_link:
* Check permission before creating a new hard link to a file.
@@ -81,8 +81,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:36.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -270,8 +270,10 @@ static int dummy_inode_create (struct in
return 0;
}
@@ -96,9 +96,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:36.000000000 -0400
-@@ -2182,11 +2182,16 @@ static int selinux_inode_create(struct i
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2185,11 +2185,16 @@ static int selinux_inode_create(struct i
return may_create(dir, dentry, SECCLASS_FILE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-listxattr.diff new/patches.apparmor/security-listxattr.diff
--- old/patches.apparmor/security-listxattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-listxattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -149,7 +149,7 @@ vfs_listxattr(struct dentry *dentry, str
struct inode *inode = dentry->d_inode;
ssize_t error;
@@ -25,8 +25,8 @@
if (error)
return error;
error = -EOPNOTSUPP;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:31.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -395,7 +395,7 @@ struct request_sock;
* Return 0 if permission is granted.
* @inode_listxattr:
@@ -70,8 +70,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:31.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -374,7 +374,7 @@ static int dummy_inode_getxattr (struct
return 0;
}
@@ -81,9 +81,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:31.000000000 -0400
-@@ -2399,7 +2399,7 @@ static int selinux_inode_getxattr (struc
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2402,7 +2402,7 @@ static int selinux_inode_getxattr (struc
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-mkdir.diff new/patches.apparmor/security-mkdir.diff
--- old/patches.apparmor/security-mkdir.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-mkdir.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 3 ++-
4 files changed, 10 insertions(+), 5 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -1946,7 +1946,7 @@ int vfs_mkdir(struct inode *dir, struct
return -EPERM;
@@ -25,8 +25,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -308,6 +308,7 @@ struct request_sock;
* associated with inode strcture @dir.
* @dir containst the inode structure of parent of the directory to be created.
@@ -67,8 +67,8 @@
int mode)
{
return 0;
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -288,7 +288,7 @@ static int dummy_inode_symlink (struct i
}
@@ -78,9 +78,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:38.000000000 -0400
-@@ -2207,7 +2207,8 @@ static int selinux_inode_symlink(struct
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2210,7 +2210,8 @@ static int selinux_inode_symlink(struct
return may_create(dir, dentry, SECCLASS_LNK_FILE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-mknod.diff new/patches.apparmor/security-mknod.diff
--- old/patches.apparmor/security-mknod.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-mknod.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 5 +++--
4 files changed, 10 insertions(+), 6 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -1869,7 +1869,7 @@ int vfs_mknod(struct inode *dir, struct
if (!dir->i_op || !dir->i_op->mknod)
return -EPERM;
@@ -25,8 +25,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:37.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -323,6 +323,7 @@ struct request_sock;
* and not this hook.
* @dir contains the inode structure of parent of the new file.
@@ -66,8 +66,8 @@
int mode, dev_t dev)
{
return 0;
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:37.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -299,7 +299,7 @@ static int dummy_inode_rmdir (struct ino
}
@@ -77,9 +77,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:37.000000000 -0400
-@@ -2218,11 +2218,12 @@ static int selinux_inode_rmdir(struct in
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2221,11 +2221,12 @@ static int selinux_inode_rmdir(struct in
return may_link(dir, dentry, MAY_RMDIR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-readlink.diff new/patches.apparmor/security-readlink.diff
--- old/patches.apparmor/security-readlink.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-readlink.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
---- a/fs/stat.c 2007-08-27 12:10:43.000000000 -0400
-+++ b/fs/stat.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/fs/stat.c
++++ linux-2.6.22/fs/stat.c
@@ -306,7 +306,7 @@ asmlinkage long sys_readlinkat(int dfd,
error = -EINVAL;
@@ -25,8 +25,8 @@
if (!error) {
touch_atime(nd.mnt, nd.dentry);
error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:36.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -338,6 +338,7 @@ struct request_sock;
* @inode_readlink:
* Check the permission to read the symbolic link.
@@ -69,8 +69,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:36.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -312,7 +312,7 @@ static int dummy_inode_rename (struct in
return 0;
}
@@ -80,9 +80,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:36.000000000 -0400
-@@ -2237,7 +2237,7 @@ static int selinux_inode_rename(struct i
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2240,7 +2240,7 @@ static int selinux_inode_rename(struct i
return may_rename(old_inode, old_dentry, new_inode, new_dentry);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-removexattr.diff new/patches.apparmor/security-removexattr.diff
--- old/patches.apparmor/security-removexattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-removexattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -15,8 +15,8 @@
security/selinux/hooks.c | 3 ++-
5 files changed, 16 insertions(+), 10 deletions(-)
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:02:30.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -177,7 +177,7 @@ vfs_removexattr(struct dentry *dentry, s
if (error)
return error;
@@ -26,8 +26,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:30.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -50,7 +50,7 @@ extern int cap_bprm_set_security (struct
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
extern int cap_bprm_secureexec(struct linux_binprm *bprm);
@@ -75,8 +75,8 @@
}
static inline const char *security_inode_xattr_getsuffix (void)
---- a/security/commoncap.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/commoncap.c 2007-08-27 14:02:30.000000000 -0400
+--- linux-2.6.22.orig/security/commoncap.c
++++ linux-2.6.22/security/commoncap.c
@@ -200,7 +200,8 @@ int cap_inode_setxattr(struct dentry *de
return 0;
}
@@ -87,8 +87,8 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:30.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -379,7 +379,8 @@ static int dummy_inode_listxattr (struct
return 0;
}
@@ -99,9 +99,9 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:30.000000000 -0400
-@@ -2404,7 +2404,8 @@ static int selinux_inode_listxattr (stru
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2407,7 +2407,8 @@ static int selinux_inode_listxattr (stru
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-rename.diff new/patches.apparmor/security-rename.diff
--- old/patches.apparmor/security-rename.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-rename.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 8 ++++++--
4 files changed, 26 insertions(+), 10 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:29.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -2417,7 +2417,8 @@ static int vfs_rename_dir(struct inode *
return error;
}
@@ -36,8 +36,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -336,8 +336,10 @@ struct request_sock;
* Check for permission to rename a file or directory.
* @old_dir contains the inode structure for parent of the old link.
@@ -92,8 +92,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -310,8 +310,10 @@ static int dummy_inode_mknod (struct ino
static int dummy_inode_rename (struct inode *old_inode,
@@ -106,9 +106,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:33.000000000 -0400
-@@ -2238,8 +2238,12 @@ static int selinux_inode_mknod(struct in
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2241,8 +2241,12 @@ static int selinux_inode_mknod(struct in
return may_create(dir, dentry, inode_mode_to_security_class(mode));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-rmdir.diff new/patches.apparmor/security-rmdir.diff
--- old/patches.apparmor/security-rmdir.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-rmdir.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 3 ++-
4 files changed, 13 insertions(+), 7 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:35.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -2041,7 +2041,7 @@ int vfs_rmdir(struct inode *dir, struct
if (d_mountpoint(dentry))
error = -EBUSY;
@@ -25,8 +25,8 @@
if (!error) {
error = dir->i_op->rmdir(dir, dentry);
if (!error)
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:35.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -318,6 +318,7 @@ struct request_sock;
* Check the permission to remove a directory.
* @dir contains the inode structure of parent of the directory to be removed.
@@ -70,8 +70,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:35.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -295,7 +295,8 @@ static int dummy_inode_mkdir (struct ino
return 0;
}
@@ -82,9 +82,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:35.000000000 -0400
-@@ -2219,7 +2219,8 @@ static int selinux_inode_mkdir(struct in
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2222,7 +2222,8 @@ static int selinux_inode_mkdir(struct in
return may_create(dir, dentry, SECCLASS_DIR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-setattr.diff new/patches.apparmor/security-setattr.diff
--- old/patches.apparmor/security-setattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-setattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 5 +++--
4 files changed, 13 insertions(+), 7 deletions(-)
---- a/fs/attr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/attr.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/fs/attr.c
++++ linux-2.6.22/fs/attr.c
@@ -144,13 +144,13 @@ int notify_change(struct dentry *dentry,
down_write(&dentry->d_inode->i_alloc_sem);
@@ -32,8 +32,8 @@
if (!error) {
if ((ia_valid & ATTR_UID && attr->ia_uid != inode->i_uid) ||
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -358,6 +358,7 @@ struct request_sock;
* file attributes change (such as when a file is truncated, chown/chmod
* operations, transferring disk quotas, etc).
@@ -74,8 +74,8 @@
struct iattr *attr)
{
return 0;
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:38.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -328,7 +328,8 @@ static int dummy_inode_permission (struc
return 0;
}
@@ -86,9 +86,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:38.000000000 -0400
-@@ -2267,11 +2267,12 @@ static int selinux_inode_permission(stru
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2270,11 +2270,12 @@ static int selinux_inode_permission(stru
file_mask_to_av(inode->i_mode, mask), NULL);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-setxattr.diff new/patches.apparmor/security-setxattr.diff
--- old/patches.apparmor/security-setxattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-setxattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -15,8 +15,8 @@
security/selinux/hooks.c | 8 ++++++--
5 files changed, 41 insertions(+), 24 deletions(-)
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -80,7 +80,7 @@ vfs_setxattr(struct dentry *dentry, stru
return error;
@@ -35,8 +35,8 @@
size, flags);
}
} else if (!strncmp(name, XATTR_SECURITY_PREFIX,
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -49,7 +49,7 @@ extern void cap_capset_set (struct task_
extern int cap_bprm_set_security (struct linux_binprm *bprm);
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
@@ -128,8 +128,8 @@
{ }
static inline int security_inode_getxattr (struct dentry *dentry, char *name)
---- a/security/commoncap.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/commoncap.c 2007-08-27 14:02:31.000000000 -0400
+--- linux-2.6.22.orig/security/commoncap.c
++++ linux-2.6.22/security/commoncap.c
@@ -190,8 +190,8 @@ int cap_bprm_secureexec (struct linux_bi
current->egid != current->gid);
}
@@ -141,8 +141,8 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -350,8 +350,9 @@ static void dummy_inode_delete (struct i
return;
}
@@ -166,9 +166,9 @@
size_t size, int flags)
{
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:33.000000000 -0400
-@@ -2305,7 +2305,9 @@ static int selinux_inode_getattr(struct
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2308,7 +2308,9 @@ static int selinux_inode_getattr(struct
return dentry_has_perm(current, mnt, dentry, FILE__GETATTR);
}
@@ -179,7 +179,7 @@
{
struct task_security_struct *tsec = current->security;
struct inode *inode = dentry->d_inode;
-@@ -2365,7 +2367,9 @@ static int selinux_inode_setxattr(struct
+@@ -2368,7 +2370,9 @@ static int selinux_inode_setxattr(struct
&ad);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-symlink.diff new/patches.apparmor/security-symlink.diff
--- old/patches.apparmor/security-symlink.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-symlink.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 3 ++-
4 files changed, 10 insertions(+), 6 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:37.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -2214,7 +2214,7 @@ int vfs_symlink(struct inode *dir, struc
if (!dir->i_op || !dir->i_op->symlink)
return -EPERM;
@@ -25,8 +25,8 @@
if (error)
return error;
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:37.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -301,6 +301,7 @@ struct request_sock;
* Check the permission to create a symbolic link to a file.
* @dir contains the inode structure of parent directory of the symbolic link.
@@ -68,8 +68,8 @@
const char *old_name)
{
return 0;
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:37.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -282,7 +282,7 @@ static int dummy_inode_unlink (struct in
}
@@ -79,9 +79,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:37.000000000 -0400
-@@ -2202,7 +2202,8 @@ static int selinux_inode_unlink(struct i
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2205,7 +2205,8 @@ static int selinux_inode_unlink(struct i
return may_link(dir, dentry, MAY_UNLINK);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-unlink.diff new/patches.apparmor/security-unlink.diff
--- old/patches.apparmor/security-unlink.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-unlink.diff 2007-10-10 20:46:10.000000000 +0200
@@ -14,8 +14,8 @@
security/selinux/hooks.c | 5 +++--
4 files changed, 14 insertions(+), 8 deletions(-)
---- a/fs/namei.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/namei.c 2007-08-27 14:02:34.000000000 -0400
+--- linux-2.6.22.orig/fs/namei.c
++++ linux-2.6.22/fs/namei.c
@@ -2121,7 +2121,7 @@ int vfs_unlink(struct inode *dir, struct
if (d_mountpoint(dentry))
error = -EBUSY;
@@ -25,8 +25,8 @@
if (!error)
error = dir->i_op->unlink(dir, dentry);
}
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:02:34.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -298,6 +298,7 @@ struct request_sock;
* Check the permission to remove a hard link to a file.
* @dir contains the inode structure of parent directory of the file.
@@ -70,8 +70,8 @@
{
return 0;
}
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:02:34.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -278,7 +278,8 @@ static int dummy_inode_link (struct dent
return 0;
}
@@ -82,9 +82,9 @@
{
return 0;
}
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:34.000000000 -0400
-@@ -2197,11 +2197,12 @@ static int selinux_inode_link(struct den
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2200,11 +2200,12 @@ static int selinux_inode_link(struct den
return may_link(dir, old_dentry, MAY_LINK);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-xattr-file.diff new/patches.apparmor/security-xattr-file.diff
--- old/patches.apparmor/security-xattr-file.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/security-xattr-file.diff 2007-10-10 20:46:10.000000000 +0200
@@ -17,8 +17,8 @@
security/selinux/hooks.c | 10 ++++----
6 files changed, 80 insertions(+), 63 deletions(-)
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -70,7 +70,7 @@ xattr_permission(struct inode *inode, co
int
@@ -270,8 +270,8 @@
fput(f);
return error;
}
---- a/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/security.h 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/include/linux/security.h
++++ linux-2.6.22/include/linux/security.h
@@ -49,8 +49,8 @@ extern void cap_capset_set (struct task_
extern int cap_bprm_set_security (struct linux_binprm *bprm);
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
@@ -407,8 +407,8 @@
}
static inline const char *security_inode_xattr_getsuffix (void)
---- a/include/linux/xattr.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/xattr.h 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/include/linux/xattr.h
++++ linux-2.6.22/include/linux/xattr.h
@@ -47,12 +47,12 @@ struct xattr_handler {
};
@@ -426,8 +426,8 @@
ssize_t generic_getxattr(struct dentry *dentry, const char *name, void *buffer, size_t size);
ssize_t generic_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size);
---- a/security/commoncap.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/commoncap.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/security/commoncap.c
++++ linux-2.6.22/security/commoncap.c
@@ -191,7 +191,7 @@ int cap_bprm_secureexec (struct linux_bi
}
@@ -446,8 +446,8 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
---- a/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/dummy.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/security/dummy.c
++++ linux-2.6.22/security/dummy.c
@@ -352,7 +352,7 @@ static void dummy_inode_delete (struct i
static int dummy_inode_setxattr (struct dentry *dentry, struct vfsmount *mnt,
@@ -481,9 +481,9 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:02:30.000000000 -0400
-@@ -2307,7 +2307,7 @@ static int selinux_inode_getattr(struct
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
+@@ -2310,7 +2310,7 @@ static int selinux_inode_getattr(struct
static int selinux_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
char *name, void *value, size_t size,
@@ -492,7 +492,7 @@
{
struct task_security_struct *tsec = current->security;
struct inode *inode = dentry->d_inode;
-@@ -2394,18 +2394,20 @@ static void selinux_inode_post_setxattr(
+@@ -2397,18 +2397,20 @@ static void selinux_inode_post_setxattr(
}
static int selinux_inode_getxattr (struct dentry *dentry, struct vfsmount *mnt,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/sysctl-pathname.diff new/patches.apparmor/sysctl-pathname.diff
--- old/patches.apparmor/sysctl-pathname.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/sysctl-pathname.diff 2007-10-10 20:46:10.000000000 +0200
@@ -13,8 +13,8 @@
security/selinux/hooks.c | 35 +++++------------------------------
3 files changed, 34 insertions(+), 30 deletions(-)
---- a/include/linux/sysctl.h 2007-08-27 14:01:19.000000000 -0400
-+++ b/include/linux/sysctl.h 2007-08-27 14:02:26.000000000 -0400
+--- linux-2.6.22.orig/include/linux/sysctl.h
++++ linux-2.6.22/include/linux/sysctl.h
@@ -964,6 +964,8 @@ extern int proc_doulongvec_minmax(ctl_ta
extern int proc_doulongvec_ms_jiffies_minmax(ctl_table *table, int,
struct file *, void __user *, size_t *, loff_t *);
@@ -24,9 +24,9 @@
extern int do_sysctl (int __user *name, int nlen,
void __user *oldval, size_t __user *oldlenp,
void __user *newval, size_t newlen);
---- a/kernel/sysctl.c 2007-08-27 14:01:19.000000000 -0400
-+++ b/kernel/sysctl.c 2007-08-27 14:01:51.000000000 -0400
-@@ -1140,6 +1140,33 @@ struct ctl_table_header *sysctl_head_nex
+--- linux-2.6.22.orig/kernel/sysctl.c
++++ linux-2.6.22/kernel/sysctl.c
+@@ -1128,6 +1128,33 @@ struct ctl_table_header *sysctl_head_nex
return NULL;
}
@@ -60,8 +60,8 @@
#ifdef CONFIG_SYSCTL_SYSCALL
int do_sysctl(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp,
void __user *newval, size_t newlen)
---- a/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/security/selinux/hooks.c 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/security/selinux/hooks.c
++++ linux-2.6.22/security/selinux/hooks.c
@@ -1427,40 +1427,15 @@ static int selinux_capable(struct task_s
static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-getxattr.diff new/patches.apparmor/vfs-getxattr.diff
--- old/patches.apparmor/vfs-getxattr.diff 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.apparmor/vfs-getxattr.diff 2007-10-10 20:46:10.000000000 +0200
@@ -16,9 +16,9 @@
include/linux/xattr.h | 3 ++-
5 files changed, 25 insertions(+), 18 deletions(-)
---- a/fs/nfsd/nfs4xdr.c 2007-08-27 12:09:34.000000000 -0400
-+++ b/fs/nfsd/nfs4xdr.c 2007-08-27 14:01:24.000000000 -0400
-@@ -1469,7 +1469,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+--- linux-2.6.22.orig/fs/nfsd/nfs4xdr.c
++++ linux-2.6.22/fs/nfsd/nfs4xdr.c
+@@ -1470,7 +1470,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
}
if (bmval0 & (FATTR4_WORD0_ACL | FATTR4_WORD0_ACLSUPPORT
| FATTR4_WORD0_SUPPORTED_ATTRS)) {
@@ -27,8 +27,8 @@
aclsupport = (err == 0);
if (bmval0 & FATTR4_WORD0_ACL) {
if (err == -EOPNOTSUPP)
---- a/fs/nfsd/vfs.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/nfsd/vfs.c 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/fs/nfsd/vfs.c
++++ linux-2.6.22/fs/nfsd/vfs.c
@@ -378,11 +378,12 @@ out_nfserr:
#if defined(CONFIG_NFSD_V2_ACL) || \
defined(CONFIG_NFSD_V3_ACL) || \
@@ -106,8 +106,8 @@
if (size < 0)
return ERR_PTR(size);
---- a/fs/xattr.c 2007-08-27 14:01:24.000000000 -0400
-+++ b/fs/xattr.c 2007-08-27 14:02:33.000000000 -0400
+--- linux-2.6.22.orig/fs/xattr.c
++++ linux-2.6.22/fs/xattr.c
@@ -106,7 +106,8 @@ out:
EXPORT_SYMBOL_GPL(vfs_setxattr);
@@ -164,8 +164,8 @@
fput(f);
return error;
}
---- a/include/linux/nfsd/nfsd.h 2007-08-27 12:09:34.000000000 -0400
-+++ b/include/linux/nfsd/nfsd.h 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/include/linux/nfsd/nfsd.h
++++ linux-2.6.22/include/linux/nfsd/nfsd.h
@@ -77,7 +77,8 @@ __be32 nfsd_setattr(struct svc_rqst *,
#ifdef CONFIG_NFSD_V4
__be32 nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
@@ -176,8 +176,8 @@
#endif /* CONFIG_NFSD_V4 */
__be32 nfsd_create(struct svc_rqst *, struct svc_fh *,
char *name, int len, struct iattr *attrs,
---- a/include/linux/xattr.h 2007-08-27 14:01:24.000000000 -0400
-+++ b/include/linux/xattr.h 2007-08-27 14:02:32.000000000 -0400
+--- linux-2.6.22.orig/include/linux/xattr.h
++++ linux-2.6.22/include/linux/xattr.h
@@ -46,7 +46,8 @@ struct xattr_handler {
size_t size, int flags);
};
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/x86-fam10-l3cache new/patches.arch/x86-fam10-l3cache
--- old/patches.arch/x86-fam10-l3cache 2007-08-27 20:13:26.000000000 +0200
+++ new/patches.arch/x86-fam10-l3cache 2007-10-10 20:46:10.000000000 +0200
@@ -12,9 +12,9 @@
arch/x86_64/kernel/setup.c | 7 ++-
3 files changed, 64 insertions(+), 23 deletions(-)
---- a/arch/i386/kernel/cpu/amd.c 2007-08-27 14:01:19.000000000 -0400
-+++ b/arch/i386/kernel/cpu/amd.c 2007-08-27 14:01:51.000000000 -0400
-@@ -276,8 +276,12 @@ static void __cpuinit init_amd(struct cp
+--- linux-2.6.22.orig/arch/i386/kernel/cpu/amd.c
++++ linux-2.6.22/arch/i386/kernel/cpu/amd.c
+@@ -275,8 +275,12 @@ static void __cpuinit init_amd(struct cp
}
#endif
@@ -29,8 +29,8 @@
#ifdef CONFIG_X86_LOCAL_APIC
if (amd_apic_timer_broken())
---- a/arch/i386/kernel/cpu/intel_cacheinfo.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/arch/i386/kernel/cpu/intel_cacheinfo.c 2007-08-27 14:01:19.000000000 -0400
+--- linux-2.6.22.orig/arch/i386/kernel/cpu/intel_cacheinfo.c
++++ linux-2.6.22/arch/i386/kernel/cpu/intel_cacheinfo.c
@@ -4,7 +4,7 @@
* Changes:
* Venkatesh Pallipadi : Adding cache identification through cpuid(4)
@@ -152,8 +152,8 @@
if (assoc == 0xf)
eax->split.is_fully_associative = 1;
ebx->split.coherency_line_size = line_size - 1;
---- a/arch/x86_64/kernel/setup.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/arch/x86_64/kernel/setup.c 2007-08-27 14:01:19.000000000 -0400
+--- linux-2.6.22.orig/arch/x86_64/kernel/setup.c
++++ linux-2.6.22/arch/x86_64/kernel/setup.c
@@ -600,8 +600,11 @@ static void __cpuinit init_amd(struct cp
if (c->extended_cpuid_level >= 0x80000008)
amd_detect_cmp(c);
++++++ patches.drivers.tar.bz2 ++++++
++++ 3084 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/i386-fixup-TRACE_IRQ-breakage new/patches.fixes/i386-fixup-TRACE_IRQ-breakage
--- old/patches.fixes/i386-fixup-TRACE_IRQ-breakage 2007-09-30 17:55:58.000000000 +0200
+++ new/patches.fixes/i386-fixup-TRACE_IRQ-breakage 2007-10-10 20:46:10.000000000 +0200
@@ -19,10 +19,8 @@
arch/i386/kernel/traps.c | 10 ++++++----
2 files changed, 6 insertions(+), 6 deletions(-)
-diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
-index 32980b8..a714d6b 100644
---- a/arch/i386/kernel/entry.S
-+++ b/arch/i386/kernel/entry.S
+--- linux-2.6.22.orig/arch/i386/kernel/entry.S
++++ linux-2.6.22/arch/i386/kernel/entry.S
@@ -409,8 +409,6 @@ restore_nocheck_notrace:
1: INTERRUPT_RETURN
.section .fixup,"ax"
@@ -32,11 +30,9 @@
pushl $0 # no error code
pushl $do_iret_error
jmp error_code
-diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
-index 18c1c28..d32fd4b 100644
---- a/arch/i386/kernel/traps.c
-+++ b/arch/i386/kernel/traps.c
-@@ -518,10 +518,12 @@ fastcall void do_##name(struct pt_regs * regs, long error_code) \
+--- linux-2.6.22.orig/arch/i386/kernel/traps.c
++++ linux-2.6.22/arch/i386/kernel/traps.c
+@@ -517,10 +517,12 @@ fastcall void do_##name(struct pt_regs *
do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \
}
@@ -50,7 +46,7 @@
info.si_signo = signr; \
info.si_errno = 0; \
info.si_code = sicode; \
-@@ -561,13 +563,13 @@ DO_VM86_ERROR( 3, SIGTRAP, "int3", int3)
+@@ -560,13 +562,13 @@ DO_VM86_ERROR( 3, SIGTRAP, "int3", int3)
#endif
DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow)
DO_VM86_ERROR( 5, SIGSEGV, "bounds", bounds)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff new/patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
--- old/patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff 2007-08-27 20:13:28.000000000 +0200
+++ new/patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-From: Andi Kleen
-Date: Fri, 10 Aug 2007 20:31:07 +0000 (+0200)
-Subject: i386: Use global flag to disable broken local apic timer on AMD CPUs.
-Patch-mainline: 2.6.23-rc3
-References: 296661
-
-i386: Use global flag to disable broken local apic timer on AMD CPUs.
-
-The Averatec 2370 and some other Turion laptop BIOS seems to program the
-ENABLE_C1E MSR inconsistently between cores. This confuses the lapic
-use heuristics because when C1E is enabled anywhere it seems to affect
-the complete chip.
-
-Use a global flag instead of a per cpu flag to handle this.
-If any CPU has C1E enabled disabled lapic use.
-
-Thanks to Cal Peake for debugging.
-
-Cc: tglx@linutronix.de
-Signed-off-by: Andi Kleen
-Signed-off-by: Linus Torvalds
----
-
- arch/i386/kernel/apic.c | 10 ++++------
- arch/i386/kernel/cpu/amd.c | 8 +++++++-
- include/asm-i386/apic.h | 2 ++
- include/asm-i386/cpufeature.h | 2 +-
- 4 files changed, 14 insertions(+), 8 deletions(-)
-
---- a/arch/i386/kernel/apic.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/arch/i386/kernel/apic.c 2007-08-27 14:04:26.000000000 -0400
-@@ -61,8 +61,9 @@ static int enable_local_apic __initdata
-
- /* Local APIC timer verification ok */
- static int local_apic_timer_verify_ok;
--/* Disable local APIC timer from the kernel commandline or via dmi quirk */
--static int local_apic_timer_disabled;
-+/* Disable local APIC timer from the kernel commandline or via dmi quirk
-+ or using CPU MSR check */
-+int local_apic_timer_disabled;
- /* Local APIC timer works in C2 */
- int local_apic_timer_c2_ok;
- EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
-@@ -367,12 +368,9 @@ void __init setup_boot_APIC_clock(void)
- long delta, deltapm;
- int pm_referenced = 0;
-
-- if (boot_cpu_has(X86_FEATURE_LAPIC_TIMER_BROKEN))
-- local_apic_timer_disabled = 1;
--
- /*
- * The local apic timer can be disabled via the kernel
-- * commandline or from the test above. Register the lapic
-+ * commandline or from the CPU detection code. Register the lapic
- * timer as a dummy clock event source on SMP systems, so the
- * broadcast mechanism is used. On UP systems simply ignore it.
- */
---- a/arch/i386/kernel/cpu/amd.c 2007-07-08 19:32:17.000000000 -0400
-+++ b/arch/i386/kernel/cpu/amd.c 2007-08-27 14:04:27.000000000 -0400
-@@ -3,6 +3,7 @@
- #include
- #include
- #include
-+#include
-
- #include "cpu.h"
-
-@@ -22,6 +23,7 @@
- extern void vide(void);
- __asm__(".align 4\nvide: ret");
-
-+#ifdef CONFIG_X86_LOCAL_APIC
- #define ENABLE_C1E_MASK 0x18000000
- #define CPUID_PROCESSOR_SIGNATURE 1
- #define CPUID_XFAM 0x0ff00000
-@@ -52,6 +54,7 @@ static __cpuinit int amd_apic_timer_brok
- }
- return 0;
- }
-+#endif
-
- int force_mwait __cpuinitdata;
-
-@@ -60,6 +63,7 @@ static void __cpuinit init_amd(struct cp
- u32 l, h;
- int mbytes = num_physpages >> (20-PAGE_SHIFT);
- int r;
-+ extern int local_apic_timer_disabled;
-
- #ifdef CONFIG_SMP
- unsigned long long value;
-@@ -275,8 +279,10 @@ static void __cpuinit init_amd(struct cp
- if (cpuid_eax(0x80000000) >= 0x80000006)
- num_cache_leaves = 3;
-
-+#ifdef CONFIG_X86_LOCAL_APIC
- if (amd_apic_timer_broken())
-- set_bit(X86_FEATURE_LAPIC_TIMER_BROKEN, c->x86_capability);
-+ local_apic_timer_disabled = 1;
-+#endif
-
- if (c->x86 == 0x10 && !force_mwait)
- clear_bit(X86_FEATURE_MWAIT, c->x86_capability);
---- a/include/asm-i386/apic.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-i386/apic.h 2007-08-27 14:02:11.000000000 -0400
-@@ -116,6 +116,8 @@ extern void enable_NMI_through_LVT0 (voi
- extern int timer_over_8254;
- extern int local_apic_timer_c2_ok;
-
-+extern int local_apic_timer_disabled;
-+
- #else /* !CONFIG_X86_LOCAL_APIC */
- static inline void lapic_shutdown(void) { }
-
---- a/include/asm-i386/cpufeature.h 2007-07-08 19:32:17.000000000 -0400
-+++ b/include/asm-i386/cpufeature.h 2007-08-27 14:01:19.000000000 -0400
-@@ -79,7 +79,7 @@
- #define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */
- #define X86_FEATURE_PEBS (3*32+12) /* Precise-Event Based Sampling */
- #define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */
--#define X86_FEATURE_LAPIC_TIMER_BROKEN (3*32+ 14) /* lapic timer broken in C1 */
-+/* 14 free */
- #define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */
-
- /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/natsemi_removal.fix new/patches.fixes/natsemi_removal.fix
--- old/patches.fixes/natsemi_removal.fix 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/natsemi_removal.fix 2007-10-11 13:59:04.000000000 +0200
@@ -0,0 +1,36 @@
+From: Jeff Garzik
+Date: Tue, 17 Jul 2007 04:01:09 +0000 (-0400)
+Subject: [netdrvr] natsemi: Fix device removal bug
+Acked-by: Karsten Keil
+Reference: 332612
+
+[netdrvr] natsemi: Fix device removal bug
+
+This episode illustrates how an overused warning can train people to
+ignore that warning, which winds up hiding bugs.
+
+The warning
+
+drivers/net/natsemi.c: In function natsemi_remove
+drivers/net/natsemi.c:3222: warning: ignoring return value of
+device_create_file, declared with attribute warn_unused_result
+is oft-ignored, even though at close inspection one notices this occurs
+in the /remove/ function, not normally where creation occurs. A quick
+s/create/remove/ and we are fixed, with the warning gone.
+
+Signed-off-by: Jeff Garzik
+---
+
+diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
+index 3450051..6bb48ba 100644
+--- a/drivers/net/natsemi.c
++++ b/drivers/net/natsemi.c
+@@ -671,7 +671,7 @@ static ssize_t natsemi_show_##_name(struct device *dev, \
+ #define NATSEMI_CREATE_FILE(_dev, _name) \
+ device_create_file(&_dev->dev, &dev_attr_##_name)
+ #define NATSEMI_REMOVE_FILE(_dev, _name) \
+- device_create_file(&_dev->dev, &dev_attr_##_name)
++ device_remove_file(&_dev->dev, &dev_attr_##_name)
+
+ NATSEMI_ATTR(dspcfg_workaround);
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/nfsv4-MAXNAME-fix.diff new/patches.fixes/nfsv4-MAXNAME-fix.diff
--- old/patches.fixes/nfsv4-MAXNAME-fix.diff 2007-09-28 23:57:09.000000000 +0200
+++ new/patches.fixes/nfsv4-MAXNAME-fix.diff 2007-10-10 20:46:10.000000000 +0200
@@ -13,11 +13,9 @@
fs/nfsd/nfs4xdr.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 9cf9007..e15f2cf 100644
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -1475,7 +1475,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
+--- linux-2.6.22.orig/fs/nfsd/nfs4xdr.c
++++ linux-2.6.22/fs/nfsd/nfs4xdr.c
+@@ -1453,7 +1453,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
err = vfs_getattr(exp->ex_mnt, dentry, &stat);
if (err)
goto out_nfserr;
@@ -27,7 +25,7 @@
(bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |
FATTR4_WORD1_SPACE_TOTAL))) {
err = vfs_statfs(dentry, &statfs);
-@@ -1721,7 +1722,7 @@ out_acl:
+@@ -1699,7 +1700,7 @@ out_acl:
if (bmval0 & FATTR4_WORD0_MAXNAME) {
if ((buflen -= 4) < 0)
goto out_resource;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch new/patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch
--- old/patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch 2007-09-07 15:22:05.000000000 +0200
+++ new/patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch 2007-10-10 20:46:10.000000000 +0200
@@ -5,10 +5,10 @@
---
arch/i386/kernel/entry.S | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 1 files changed, 3 insertions(+), 3 deletions(-)
---- a/arch/i386/kernel/entry.S 2007-08-27 14:01:24.000000000 -0400
-+++ b/arch/i386/kernel/entry.S 2007-08-27 14:01:24.000000000 -0400
+--- linux-2.6.22.orig/arch/i386/kernel/entry.S
++++ linux-2.6.22/arch/i386/kernel/entry.S
@@ -287,7 +287,7 @@ ENTRY(sysenter_entry)
CFI_SIGNAL_FRAME
CFI_DEF_CFA esp, 0
@@ -18,7 +18,7 @@
sysenter_past_esp:
/*
* No need to follow this irqs on/off section: the syscall
-@@ -741,7 +741,7 @@ END(device_not_available)
+@@ -739,7 +739,7 @@ END(device_not_available)
* that sets up the real kernel stack. Check here, since we can't
* allow the wrong stack to be used.
*
@@ -27,7 +27,7 @@
* already pushed 3 words if it hits on the sysenter instruction:
* eflags, cs and eip.
*
-@@ -753,7 +753,7 @@ END(device_not_available)
+@@ -751,7 +751,7 @@ END(device_not_available)
cmpw $__KERNEL_CS,4(%esp); \
jne ok; \
label: \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/sky2-tx-sum-resume.patch new/patches.fixes/sky2-tx-sum-resume.patch
--- old/patches.fixes/sky2-tx-sum-resume.patch 2007-09-30 22:17:35.000000000 +0200
+++ new/patches.fixes/sky2-tx-sum-resume.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-From: Stephen Hemminger
-Acked-by: Karsten Keil
-Subject: sky2: fix transmit state on resume
-
-After resume, driver has reset the chip so the current state
-of transmit checksum offload state machine and DMA state machine
-will be undefined.
-
-The fix is to set the state so that first Tx will set MSS and offset
-values.
-
-Signed-off-by: Stephen Hemminger
-
-Index: linux-2.6.22/drivers/net/sky2.c
-===================================================================
---- linux-2.6.22.orig/drivers/net/sky2.c
-+++ linux-2.6.22/drivers/net/sky2.c
-@@ -835,6 +835,20 @@ static inline struct sky2_tx_le *get_tx_
- return le;
- }
-
-+static void tx_init(struct sky2_port *sky2)
-+{
-+ struct sky2_tx_le *le;
-+
-+ sky2->tx_prod = sky2->tx_cons = 0;
-+ sky2->tx_tcpsum = 0;
-+ sky2->tx_last_mss = 0;
-+
-+ le = get_tx_le(sky2);
-+ le->addr = 0;
-+ le->opcode = OP_ADDR64 | HW_OWNER;
-+ sky2->tx_addr64 = 0;
-+}
-+
- static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
- struct sky2_tx_le *le)
- {
-@@ -1248,7 +1262,8 @@ static int sky2_up(struct net_device *de
- GFP_KERNEL);
- if (!sky2->tx_ring)
- goto err_out;
-- sky2->tx_prod = sky2->tx_cons = 0;
-+
-+ tx_init(sky2);
-
- sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
- &sky2->rx_le_map);
++++++ patches.kernel.org.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.22.9-10 new/patches.kernel.org/patch-2.6.22.9-10
--- old/patches.kernel.org/patch-2.6.22.9-10 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.kernel.org/patch-2.6.22.9-10 2007-10-10 20:09:10.000000000 +0200
@@ -0,0 +1,701 @@
+Subject: Linux 2.6.22.10
+From: Greg Kroah-Hartman
+
+Signed-off-by: Greg Kroah-Hartman
+
+diff --git a/Makefile b/Makefile
+index 6f8adbb..9da26d2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .9
++EXTRAVERSION = .10
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*
+diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
+index 67824f3..a8ceb7a 100644
+--- a/arch/i386/kernel/apic.c
++++ b/arch/i386/kernel/apic.c
+@@ -61,8 +61,9 @@ static int enable_local_apic __initdata = 0;
+
+ /* Local APIC timer verification ok */
+ static int local_apic_timer_verify_ok;
+-/* Disable local APIC timer from the kernel commandline or via dmi quirk */
+-static int local_apic_timer_disabled;
++/* Disable local APIC timer from the kernel commandline or via dmi quirk
++ or using CPU MSR check */
++int local_apic_timer_disabled;
+ /* Local APIC timer works in C2 */
+ int local_apic_timer_c2_ok;
+ EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
+@@ -367,12 +368,9 @@ void __init setup_boot_APIC_clock(void)
+ long delta, deltapm;
+ int pm_referenced = 0;
+
+- if (boot_cpu_has(X86_FEATURE_LAPIC_TIMER_BROKEN))
+- local_apic_timer_disabled = 1;
+-
+ /*
+ * The local apic timer can be disabled via the kernel
+- * commandline or from the test above. Register the lapic
++ * commandline or from the CPU detection code. Register the lapic
+ * timer as a dummy clock event source on SMP systems, so the
+ * broadcast mechanism is used. On UP systems simply ignore it.
+ */
+diff --git a/arch/i386/kernel/cpu/amd.c b/arch/i386/kernel/cpu/amd.c
+index 6f47eee..9d23390 100644
+--- a/arch/i386/kernel/cpu/amd.c
++++ b/arch/i386/kernel/cpu/amd.c
+@@ -3,6 +3,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "cpu.h"
+
+@@ -22,6 +23,7 @@
+ extern void vide(void);
+ __asm__(".align 4\nvide: ret");
+
++#ifdef CONFIG_X86_LOCAL_APIC
+ #define ENABLE_C1E_MASK 0x18000000
+ #define CPUID_PROCESSOR_SIGNATURE 1
+ #define CPUID_XFAM 0x0ff00000
+@@ -52,6 +54,7 @@ static __cpuinit int amd_apic_timer_broken(void)
+ }
+ return 0;
+ }
++#endif
+
+ int force_mwait __cpuinitdata;
+
+@@ -275,8 +278,10 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
+ if (cpuid_eax(0x80000000) >= 0x80000006)
+ num_cache_leaves = 3;
+
++#ifdef CONFIG_X86_LOCAL_APIC
+ if (amd_apic_timer_broken())
+- set_bit(X86_FEATURE_LAPIC_TIMER_BROKEN, c->x86_capability);
++ local_apic_timer_disabled = 1;
++#endif
+
+ if (c->x86 == 0x10 && !force_mwait)
+ clear_bit(X86_FEATURE_MWAIT, c->x86_capability);
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 9ad8caf..e6e403f 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -3774,6 +3774,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
+ { "SAMSUNG CD-ROM SN-124","N001", ATA_HORKAGE_NODMA },
+ { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA },
+ { "IOMEGA ZIP 250 ATAPI", NULL, ATA_HORKAGE_NODMA }, /* temporary fix */
++ { "IOMEGA ZIP 250 ATAPI Floppy",
++ NULL, ATA_HORKAGE_NODMA },
+
+ /* Weird ATAPI devices */
+ { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 },
+@@ -3787,7 +3789,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
+ { "FUJITSU MHT2060BH", NULL, ATA_HORKAGE_NONCQ },
+ /* NCQ is broken */
+ { "Maxtor 6L250S0", "BANC1G10", ATA_HORKAGE_NONCQ },
++ { "Maxtor 6B200M0", "BANC1BM0", ATA_HORKAGE_NONCQ },
+ { "Maxtor 6B200M0", "BANC1B10", ATA_HORKAGE_NONCQ },
++ { "Maxtor 7B250S0", "BANC1B70", ATA_HORKAGE_NONCQ, },
++ { "Maxtor 7B300S0", "BANC1B70", ATA_HORKAGE_NONCQ },
++ { "Maxtor 7V300F0", "VA111630", ATA_HORKAGE_NONCQ },
++ { "HITACHI HDS7250SASUN500G 0621KTAWSD", "K2AOAJ0AHITACHI",
++ ATA_HORKAGE_NONCQ },
+ /* NCQ hard hangs device under heavier load, needs hard power cycle */
+ { "Maxtor 6B250S0", "BANC1B70", ATA_HORKAGE_NONCQ },
+ /* Blacklist entries taken from Silicon Image 3124/3132
+@@ -3801,8 +3809,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
+ { "Hitachi HTS541616J9SA00", "SB4OC70P", ATA_HORKAGE_NONCQ, },
+ { "WDC WD740ADFD-00NLR1", NULL, ATA_HORKAGE_NONCQ, },
+ { "FUJITSU MHV2080BH", "00840028", ATA_HORKAGE_NONCQ, },
+-
+- /* Devices with NCQ limits */
++ { "ST9160821AS", "3.CLF", ATA_HORKAGE_NONCQ, },
++ { "ST3160812AS", "3.AD", ATA_HORKAGE_NONCQ, },
++ { "SAMSUNG HD401LJ", "ZZ100-15", ATA_HORKAGE_NONCQ, },
+
+ /* End Marker */
+ { }
+diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
+index 8a5f582..7f0a0a6 100644
+--- a/drivers/i2c/algos/i2c-algo-bit.c
++++ b/drivers/i2c/algos/i2c-algo-bit.c
+@@ -357,13 +357,29 @@ static int sendbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
+ return wrcount;
+ }
+
++static int acknak(struct i2c_adapter *i2c_adap, int is_ack)
++{
++ struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
++
++ /* assert: sda is high */
++ if (is_ack) /* send ack */
++ setsda(adap, 0);
++ udelay((adap->udelay + 1) / 2);
++ if (sclhi(adap) < 0) { /* timeout */
++ dev_err(&i2c_adap->dev, "readbytes: ack/nak timeout\n");
++ return -ETIMEDOUT;
++ }
++ scllo(adap);
++ return 0;
++}
++
+ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
+ {
+ int inval;
+ int rdcount=0; /* counts bytes read */
+- struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
+ unsigned char *temp = msg->buf;
+ int count = msg->len;
++ const unsigned flags = msg->flags;
+
+ while (count > 0) {
+ inval = i2c_inb(i2c_adap);
+@@ -377,28 +393,12 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
+ temp++;
+ count--;
+
+- if (msg->flags & I2C_M_NO_RD_ACK) {
+- bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x\n",
+- inval);
+- continue;
+- }
+-
+- /* assert: sda is high */
+- if (count) /* send ack */
+- setsda(adap, 0);
+- udelay((adap->udelay + 1) / 2);
+- bit_dbg(2, &i2c_adap->dev, "i2c_inb: 0x%02x %s\n", inval,
+- count ? "A" : "NA");
+- if (sclhi(adap)<0) { /* timeout */
+- dev_err(&i2c_adap->dev, "readbytes: timeout at ack\n");
+- return -ETIMEDOUT;
+- };
+- scllo(adap);
+-
+ /* Some SMBus transactions require that we receive the
+ transaction length as the first read byte. */
+- if (rdcount == 1 && (msg->flags & I2C_M_RECV_LEN)) {
++ if (rdcount == 1 && (flags & I2C_M_RECV_LEN)) {
+ if (inval <= 0 || inval > I2C_SMBUS_BLOCK_MAX) {
++ if (!(flags & I2C_M_NO_RD_ACK))
++ acknak(i2c_adap, 0);
+ dev_err(&i2c_adap->dev, "readbytes: invalid "
+ "block length (%d)\n", inval);
+ return -EREMOTEIO;
+@@ -409,6 +409,18 @@ static int readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msg)
+ count += inval;
+ msg->len += inval;
+ }
++
++ bit_dbg(2, &i2c_adap->dev, "readbytes: 0x%02x %s\n",
++ inval,
++ (flags & I2C_M_NO_RD_ACK)
++ ? "(no ack/nak)"
++ : (count ? "A" : "NA"));
++
++ if (!(flags & I2C_M_NO_RD_ACK)) {
++ inval = acknak(i2c_adap, count);
++ if (inval < 0)
++ return inval;
++ }
+ }
+ return rdcount;
+ }
+diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c
+index d5bdd25..39e0e12 100644
+--- a/drivers/net/ppp_mppe.c
++++ b/drivers/net/ppp_mppe.c
+@@ -136,7 +136,7 @@ struct ppp_mppe_state {
+ * Key Derivation, from RFC 3078, RFC 3079.
+ * Equivalent to Get_Key() for MS-CHAP as described in RFC 3079.
+ */
+-static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *InterimKey)
++static void get_new_key_from_sha(struct ppp_mppe_state * state)
+ {
+ struct hash_desc desc;
+ struct scatterlist sg[4];
+@@ -153,8 +153,6 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
+ desc.flags = 0;
+
+ crypto_hash_digest(&desc, sg, nbytes, state->sha1_digest);
+-
+- memcpy(InterimKey, state->sha1_digest, state->keylen);
+ }
+
+ /*
+@@ -163,21 +161,21 @@ static void get_new_key_from_sha(struct ppp_mppe_state * state, unsigned char *I
+ */
+ static void mppe_rekey(struct ppp_mppe_state * state, int initial_key)
+ {
+- unsigned char InterimKey[MPPE_MAX_KEY_LEN];
+ struct scatterlist sg_in[1], sg_out[1];
+ struct blkcipher_desc desc = { .tfm = state->arc4 };
+
+- get_new_key_from_sha(state, InterimKey);
++ get_new_key_from_sha(state);
+ if (!initial_key) {
+- crypto_blkcipher_setkey(state->arc4, InterimKey, state->keylen);
+- setup_sg(sg_in, InterimKey, state->keylen);
++ crypto_blkcipher_setkey(state->arc4, state->sha1_digest,
++ state->keylen);
++ setup_sg(sg_in, state->sha1_digest, state->keylen);
+ setup_sg(sg_out, state->session_key, state->keylen);
+ if (crypto_blkcipher_encrypt(&desc, sg_out, sg_in,
+ state->keylen) != 0) {
+ printk(KERN_WARNING "mppe_rekey: cipher_encrypt failed\n");
+ }
+ } else {
+- memcpy(state->session_key, InterimKey, state->keylen);
++ memcpy(state->session_key, state->sha1_digest, state->keylen);
+ }
+ if (state->keylen == 8) {
+ /* See RFC 3078 */
+diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
+index 2e76c4a..607b1a3 100644
+--- a/drivers/net/sky2.c
++++ b/drivers/net/sky2.c
+@@ -96,10 +96,6 @@ static int disable_msi = 0;
+ module_param(disable_msi, int, 0);
+ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
+
+-static int idle_timeout = 100;
+-module_param(idle_timeout, int, 0);
+-MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
+-
+ static const struct pci_device_id sky2_id_table[] = {
+ { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) }, /* SK-9Sxx */
+ { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) }, /* SK-9Exx */
+@@ -835,6 +831,20 @@ static inline struct sky2_tx_le *get_tx_le(struct sky2_port *sky2)
+ return le;
+ }
+
++static void tx_init(struct sky2_port *sky2)
++{
++ struct sky2_tx_le *le;
++
++ sky2->tx_prod = sky2->tx_cons = 0;
++ sky2->tx_tcpsum = 0;
++ sky2->tx_last_mss = 0;
++
++ le = get_tx_le(sky2);
++ le->addr = 0;
++ le->opcode = OP_ADDR64 | HW_OWNER;
++ sky2->tx_addr64 = 0;
++}
++
+ static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
+ struct sky2_tx_le *le)
+ {
+@@ -1248,7 +1258,8 @@ static int sky2_up(struct net_device *dev)
+ GFP_KERNEL);
+ if (!sky2->tx_ring)
+ goto err_out;
+- sky2->tx_prod = sky2->tx_cons = 0;
++
++ tx_init(sky2);
+
+ sky2->rx_le = pci_alloc_consistent(hw->pdev, RX_LE_BYTES,
+ &sky2->rx_le_map);
+@@ -1693,6 +1704,8 @@ static void sky2_link_up(struct sky2_port *sky2)
+
+ netif_carrier_on(sky2->netdev);
+
++ mod_timer(&hw->watchdog_timer, jiffies + 1);
++
+ /* Turn on link LED */
+ sky2_write8(hw, SK_REG(port, LNK_LED_REG),
+ LINKLED_ON | LINKLED_BLINK_OFF | LINKLED_LINKSYNC_OFF);
+@@ -2051,6 +2064,7 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
+ struct sky2_port *sky2 = netdev_priv(dev);
+ struct rx_ring_info *re = sky2->rx_ring + sky2->rx_next;
+ struct sk_buff *skb = NULL;
++ u16 count;
+
+ if (unlikely(netif_msg_rx_status(sky2)))
+ printk(KERN_DEBUG PFX "%s: rx slot %u status 0x%x len %d\n",
+@@ -2065,7 +2079,13 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
+ if (!(status & GMR_FS_RX_OK))
+ goto resubmit;
+
+- if (status >> 16 != length)
++ count = (status & GMR_FS_LEN) >> 16;
++#ifdef SKY2_VLAN_TAG_USED
++ /* Account for vlan tag */
++ if (sky2->vlgrp && (status & GMR_FS_VLAN))
++ count -= VLAN_HLEN;
++#endif
++ if (count != length)
+ goto len_mismatch;
+
+ if (length < copybreak)
+@@ -2384,25 +2404,25 @@ static void sky2_le_error(struct sky2_hw *hw, unsigned port,
+ sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_IRQ_CHK);
+ }
+
+-/* If idle then force a fake soft NAPI poll once a second
+- * to work around cases where sharing an edge triggered interrupt.
+- */
+-static inline void sky2_idle_start(struct sky2_hw *hw)
+-{
+- if (idle_timeout > 0)
+- mod_timer(&hw->idle_timer,
+- jiffies + msecs_to_jiffies(idle_timeout));
+-}
+-
+-static void sky2_idle(unsigned long arg)
++/* Force a fake soft NAPI poll to handle lost IRQ's */
++static void sky2_watchdog(unsigned long arg)
+ {
+ struct sky2_hw *hw = (struct sky2_hw *) arg;
+ struct net_device *dev = hw->dev[0];
++ int i, active = 0;
+
+ if (__netif_rx_schedule_prep(dev))
+ __netif_rx_schedule(dev);
+
+- mod_timer(&hw->idle_timer, jiffies + msecs_to_jiffies(idle_timeout));
++ for (i = 0; i < hw->ports; i++) {
++ dev = hw->dev[i];
++ if (!netif_running(dev))
++ continue;
++ ++active;
++ }
++
++ if (active)
++ mod_timer(&hw->watchdog_timer, round_jiffies(jiffies + HZ));
+ }
+
+ /* Hardware/software error handling */
+@@ -2692,8 +2712,6 @@ static void sky2_restart(struct work_struct *work)
+
+ dev_dbg(&hw->pdev->dev, "restarting\n");
+
+- del_timer_sync(&hw->idle_timer);
+-
+ rtnl_lock();
+ sky2_write32(hw, B0_IMSK, 0);
+ sky2_read32(hw, B0_IMSK);
+@@ -2722,8 +2740,6 @@ static void sky2_restart(struct work_struct *work)
+ }
+ }
+
+- sky2_idle_start(hw);
+-
+ rtnl_unlock();
+ }
+
+@@ -3713,11 +3729,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
+ sky2_show_addr(dev1);
+ }
+
+- setup_timer(&hw->idle_timer, sky2_idle, (unsigned long) hw);
++ setup_timer(&hw->watchdog_timer, sky2_watchdog, (unsigned long) hw);
+ INIT_WORK(&hw->restart_work, sky2_restart);
+
+- sky2_idle_start(hw);
+-
+ pci_set_drvdata(pdev, hw);
+
+ return 0;
+@@ -3752,7 +3766,7 @@ static void __devexit sky2_remove(struct pci_dev *pdev)
+ if (!hw)
+ return;
+
+- del_timer_sync(&hw->idle_timer);
++ del_timer_sync(&hw->watchdog_timer);
+
+ flush_scheduled_work();
+
+@@ -3796,7 +3810,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
+ if (!hw)
+ return 0;
+
+- del_timer_sync(&hw->idle_timer);
++ del_timer_sync(&hw->watchdog_timer);
+ netif_poll_disable(hw->dev[0]);
+
+ for (i = 0; i < hw->ports; i++) {
+@@ -3862,7 +3876,7 @@ static int sky2_resume(struct pci_dev *pdev)
+ }
+
+ netif_poll_enable(hw->dev[0]);
+- sky2_idle_start(hw);
++
+ return 0;
+ out:
+ dev_err(&pdev->dev, "resume failed (%d)\n", err);
+@@ -3879,7 +3893,6 @@ static void sky2_shutdown(struct pci_dev *pdev)
+ if (!hw)
+ return;
+
+- del_timer_sync(&hw->idle_timer);
+ netif_poll_disable(hw->dev[0]);
+
+ for (i = 0; i < hw->ports; i++) {
+diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
+index b8c4a3b..a059e0a 100644
+--- a/drivers/net/sky2.h
++++ b/drivers/net/sky2.h
+@@ -1921,7 +1921,7 @@ struct sky2_hw {
+ u32 st_idx;
+ dma_addr_t st_dma;
+
+- struct timer_list idle_timer;
++ struct timer_list watchdog_timer;
+ struct work_struct restart_work;
+ int msi;
+ wait_queue_head_t msi_wait;
+diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
+index 6f56f87..4df21c9 100644
+--- a/drivers/scsi/scsi_transport_spi.c
++++ b/drivers/scsi/scsi_transport_spi.c
+@@ -787,10 +787,12 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+ struct scsi_target *starget = sdev->sdev_target;
+ struct Scsi_Host *shost = sdev->host;
+ int len = sdev->inquiry_len;
++ int min_period = spi_min_period(starget);
++ int max_width = spi_max_width(starget);
+ /* first set us up for narrow async */
+ DV_SET(offset, 0);
+ DV_SET(width, 0);
+-
++
+ if (spi_dv_device_compare_inquiry(sdev, buffer, buffer, DV_LOOPS)
+ != SPI_COMPARE_SUCCESS) {
+ starget_printk(KERN_ERR, starget, "Domain Validation Initial Inquiry Failed\n");
+@@ -798,9 +800,13 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+ return;
+ }
+
++ if (!scsi_device_wide(sdev)) {
++ spi_max_width(starget) = 0;
++ max_width = 0;
++ }
++
+ /* test width */
+- if (i->f->set_width && spi_max_width(starget) &&
+- scsi_device_wide(sdev)) {
++ if (i->f->set_width && max_width) {
+ i->f->set_width(starget, 1);
+
+ if (spi_dv_device_compare_inquiry(sdev, buffer,
+@@ -809,6 +815,11 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+ != SPI_COMPARE_SUCCESS) {
+ starget_printk(KERN_ERR, starget, "Wide Transfers Fail\n");
+ i->f->set_width(starget, 0);
++ /* Make sure we don't force wide back on by asking
++ * for a transfer period that requires it */
++ max_width = 0;
++ if (min_period < 10)
++ min_period = 10;
+ }
+ }
+
+@@ -828,7 +839,8 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+
+ /* now set up to the maximum */
+ DV_SET(offset, spi_max_offset(starget));
+- DV_SET(period, spi_min_period(starget));
++ DV_SET(period, min_period);
++
+ /* try QAS requests; this should be harmless to set if the
+ * target supports it */
+ if (scsi_device_qas(sdev)) {
+@@ -837,14 +849,14 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+ DV_SET(qas, 0);
+ }
+
+- if (scsi_device_ius(sdev) && spi_min_period(starget) < 9) {
++ if (scsi_device_ius(sdev) && min_period < 9) {
+ /* This u320 (or u640). Set IU transfers */
+ DV_SET(iu, 1);
+ /* Then set the optional parameters */
+ DV_SET(rd_strm, 1);
+ DV_SET(wr_flow, 1);
+ DV_SET(rti, 1);
+- if (spi_min_period(starget) == 8)
++ if (min_period == 8)
+ DV_SET(pcomp_en, 1);
+ } else {
+ DV_SET(iu, 0);
+@@ -862,6 +874,10 @@ spi_dv_device_internal(struct scsi_device *sdev, u8 *buffer)
+ } else {
+ DV_SET(dt, 1);
+ }
++ /* set width last because it will pull all the other
++ * parameters down to required values */
++ DV_SET(width, max_width);
++
+ /* Do the read only INQUIRY tests */
+ spi_dv_retrain(sdev, buffer, buffer + sdev->inquiry_len,
+ spi_dv_device_compare_inquiry);
+diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
+index b3efa45..7b951a2 100644
+--- a/fs/lockd/svclock.c
++++ b/fs/lockd/svclock.c
+@@ -171,19 +171,14 @@ found:
+ * GRANTED_RES message by cookie, without having to rely on the client's IP
+ * address. --okir
+ */
+-static inline struct nlm_block *
+-nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_file *file,
+- struct nlm_lock *lock, struct nlm_cookie *cookie)
++static struct nlm_block *
++nlmsvc_create_block(struct svc_rqst *rqstp, struct nlm_host *host,
++ struct nlm_file *file, struct nlm_lock *lock,
++ struct nlm_cookie *cookie)
+ {
+ struct nlm_block *block;
+- struct nlm_host *host;
+ struct nlm_rqst *call = NULL;
+
+- /* Create host handle for callback */
+- host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
+- if (host == NULL)
+- return NULL;
+-
+ call = nlm_alloc_call(host);
+ if (call == NULL)
+ return NULL;
+@@ -366,6 +361,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
+ struct nlm_lock *lock, int wait, struct nlm_cookie *cookie)
+ {
+ struct nlm_block *block = NULL;
++ struct nlm_host *host;
+ int error;
+ __be32 ret;
+
+@@ -377,6 +373,10 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
+ (long long)lock->fl.fl_end,
+ wait);
+
++ /* Create host handle for callback */
++ host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
++ if (host == NULL)
++ return nlm_lck_denied_nolocks;
+
+ /* Lock file against concurrent access */
+ mutex_lock(&file->f_mutex);
+@@ -385,7 +385,8 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
+ */
+ block = nlmsvc_lookup_block(file, lock);
+ if (block == NULL) {
+- block = nlmsvc_create_block(rqstp, file, lock, cookie);
++ block = nlmsvc_create_block(rqstp, nlm_get_host(host), file,
++ lock, cookie);
+ ret = nlm_lck_denied_nolocks;
+ if (block == NULL)
+ goto out;
+@@ -449,6 +450,7 @@ nlmsvc_lock(struct svc_rqst *rqstp, struct nlm_file *file,
+ out:
+ mutex_unlock(&file->f_mutex);
+ nlmsvc_release_block(block);
++ nlm_release_host(host);
+ dprintk("lockd: nlmsvc_lock returned %u\n", ret);
+ return ret;
+ }
+@@ -477,10 +479,17 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
+
+ if (block == NULL) {
+ struct file_lock *conf = kzalloc(sizeof(*conf), GFP_KERNEL);
++ struct nlm_host *host;
+
+ if (conf == NULL)
+ return nlm_granted;
+- block = nlmsvc_create_block(rqstp, file, lock, cookie);
++ /* Create host handle for callback */
++ host = nlmsvc_lookup_host(rqstp, lock->caller, lock->len);
++ if (host == NULL) {
++ kfree(conf);
++ return nlm_lck_denied_nolocks;
++ }
++ block = nlmsvc_create_block(rqstp, host, file, lock, cookie);
+ if (block == NULL) {
+ kfree(conf);
+ return nlm_granted;
+diff --git a/include/asm-i386/apic.h b/include/asm-i386/apic.h
+index 1e8f6f2..4091b33 100644
+--- a/include/asm-i386/apic.h
++++ b/include/asm-i386/apic.h
+@@ -116,6 +116,8 @@ extern void enable_NMI_through_LVT0 (void * dummy);
+ extern int timer_over_8254;
+ extern int local_apic_timer_c2_ok;
+
++extern int local_apic_timer_disabled;
++
+ #else /* !CONFIG_X86_LOCAL_APIC */
+ static inline void lapic_shutdown(void) { }
+
+diff --git a/include/asm-i386/cpufeature.h b/include/asm-i386/cpufeature.h
+index f514e90..ddc2d7c 100644
+--- a/include/asm-i386/cpufeature.h
++++ b/include/asm-i386/cpufeature.h
+@@ -79,7 +79,7 @@
+ #define X86_FEATURE_ARCH_PERFMON (3*32+11) /* Intel Architectural PerfMon */
+ #define X86_FEATURE_PEBS (3*32+12) /* Precise-Event Based Sampling */
+ #define X86_FEATURE_BTS (3*32+13) /* Branch Trace Store */
+-#define X86_FEATURE_LAPIC_TIMER_BROKEN (3*32+ 14) /* lapic timer broken in C1 */
++/* 14 free */
+ #define X86_FEATURE_SYNC_RDTSC (3*32+15) /* RDTSC synchronizes the CPU */
+
+ /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
+diff --git a/kernel/sys.c b/kernel/sys.c
+index 28e8364..afd9b93 100644
+--- a/kernel/sys.c
++++ b/kernel/sys.c
+@@ -31,6 +31,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include
+@@ -865,6 +866,7 @@ EXPORT_SYMBOL_GPL(kernel_halt);
+ void kernel_power_off(void)
+ {
+ kernel_shutdown_prepare(SYSTEM_POWER_OFF);
++ disable_nonboot_cpus();
+ printk(KERN_EMERG "Power down.\n");
+ machine_power_off();
+ }
+diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
+index 7bb561d..5717cfb 100644
+--- a/kernel/time/timer_stats.c
++++ b/kernel/time/timer_stats.c
+@@ -319,8 +319,9 @@ static int tstats_show(struct seq_file *m, void *v)
+ ms = 1;
+
+ if (events && period.tv_sec)
+- seq_printf(m, "%ld total events, %ld.%ld events/sec\n", events,
+- events / period.tv_sec, events * 1000 / ms);
++ seq_printf(m, "%ld total events, %ld.%03ld events/sec\n",
++ events, events * 1000 / ms,
++ (events * 1000000 / ms) % 1000);
+ else
+ seq_printf(m, "%ld total events\n", events);
+
+diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
+index ad8dd4e..1ee7ca9 100644
+--- a/security/selinux/hooks.c
++++ b/security/selinux/hooks.c
+@@ -1906,6 +1906,9 @@ static void selinux_bprm_post_apply_creds(struct linux_binprm *bprm)
+ spin_unlock_irq(¤t->sighand->siglock);
+ }
+
++ /* Always clear parent death signal on SID transitions. */
++ current->pdeath_signal = 0;
++
+ /* Check whether the new SID can inherit resource limits
+ from the old SID. If not, reset all soft limits to
+ the lower of the current task's hard limit and the init
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
++++ 6654 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-common new/patches.suse/kdb-common
--- old/patches.suse/kdb-common 2007-09-26 20:28:37.000000000 +0200
+++ new/patches.suse/kdb-common 2007-10-10 20:46:10.000000000 +0200
@@ -24775,7 +24775,7 @@
*/
--- linux-2.6.22.orig/kernel/sched.c
+++ linux-2.6.22/kernel/sched.c
-@@ -7185,7 +7185,7 @@ void normalize_rt_tasks(void)
+@@ -7157,7 +7157,7 @@ void normalize_rt_tasks(void)
#endif /* CONFIG_MAGIC_SYSRQ */
@@ -24784,7 +24784,7 @@
/*
* These functions are only useful for the IA64 MCA handling.
*
-@@ -7228,3 +7228,80 @@ void set_curr_task(int cpu, struct task_
+@@ -7200,3 +7200,80 @@ void set_curr_task(int cpu, struct task_
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-i386 new/patches.suse/kdb-i386
--- old/patches.suse/kdb-i386 2007-09-26 20:28:37.000000000 +0200
+++ new/patches.suse/kdb-i386 2007-10-10 20:46:10.000000000 +0200
@@ -8896,7 +8896,7 @@
+#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
--- linux-2.6.22.orig/arch/i386/kernel/entry.S
+++ linux-2.6.22/arch/i386/kernel/entry.S
-@@ -978,6 +978,26 @@ ENTRY(alignment_check)
+@@ -976,6 +976,26 @@ ENTRY(alignment_check)
CFI_ENDPROC
END(alignment_check)
@@ -8998,7 +8998,7 @@
if (!regs)
return;
-@@ -556,7 +564,7 @@ fastcall void do_##name(struct pt_regs *
+@@ -558,7 +566,7 @@ fastcall void do_##name(struct pt_regs *
}
DO_VM86_ERROR_INFO( 0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->eip)
@@ -9007,7 +9007,7 @@
DO_VM86_ERROR( 3, SIGTRAP, "int3", int3)
#endif
DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow)
-@@ -665,6 +673,9 @@ io_check_error(unsigned char reason, str
+@@ -667,6 +675,9 @@ io_check_error(unsigned char reason, str
static __kprobes void
unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
{
@@ -9017,7 +9017,7 @@
#ifdef CONFIG_MCA
/* Might actually be able to figure out what the guilty party
* is. */
-@@ -700,6 +711,9 @@ void __kprobes die_nmi(struct pt_regs *r
+@@ -702,6 +713,9 @@ void __kprobes die_nmi(struct pt_regs *r
printk(" on CPU%d, eip %08lx, registers:\n",
smp_processor_id(), regs->eip);
show_registers(regs);
@@ -9027,7 +9027,7 @@
console_silent();
spin_unlock(&nmi_print_lock);
bust_spinlocks(0);
-@@ -722,7 +736,17 @@ static __kprobes void default_do_nmi(str
+@@ -724,7 +738,17 @@ static __kprobes void default_do_nmi(str
/* Only the BSP gets external NMIs from the system. */
if (!smp_processor_id())
reason = get_nmi_reason();
@@ -9046,7 +9046,7 @@
if (!(reason & 0xc0)) {
if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT)
== NOTIFY_STOP)
-@@ -771,6 +795,10 @@ fastcall __kprobes void do_nmi(struct pt
+@@ -773,6 +797,10 @@ fastcall __kprobes void do_nmi(struct pt
#ifdef CONFIG_KPROBES
fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
{
@@ -9057,7 +9057,7 @@
if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
== NOTIFY_STOP)
return;
-@@ -810,6 +838,11 @@ fastcall void __kprobes do_debug(struct
+@@ -812,6 +840,11 @@ fastcall void __kprobes do_debug(struct
get_debugreg(condition, 6);
@@ -9069,7 +9069,7 @@
if (notify_die(DIE_DEBUG, "debug", regs, condition, error_code,
SIGTRAP) == NOTIFY_STOP)
return;
-@@ -863,6 +896,16 @@ clear_TF_reenable:
+@@ -865,6 +898,16 @@ clear_TF_reenable:
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ocfs2-14-fix-notifier-hang.diff new/patches.suse/ocfs2-14-fix-notifier-hang.diff
--- old/patches.suse/ocfs2-14-fix-notifier-hang.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/ocfs2-14-fix-notifier-hang.diff 2007-10-09 17:57:42.000000000 +0200
@@ -0,0 +1,20 @@
+From: Jan Kara
+Subject: Fix kernel hang during cluster initialization
+Reference: 300730
+Patch-mainline: Never (mainline does not have this code)
+
+Fix hang during cluster initialization due to uninitialized rwlock.
+
+Signed-off-by: Jan Kara
+
+--- a/fs/ocfs2/cluster/tcp.c.orig 2007-10-09 16:05:14.000000000 +0200
++++ b/fs/ocfs2/cluster/tcp.c 2007-10-09 15:57:52.000000000 +0200
+@@ -129,7 +129,7 @@ static struct work_struct o2net_listen_w
+ static struct o2hb_callback_func o2net_hb_up, o2net_hb_down;
+ #define O2NET_HB_PRI 0x2
+
+-static struct blocking_notifier_head o2net_notifier_head;
++static BLOCKING_NOTIFIER_HEAD(o2net_notifier_head);
+
+ static struct o2net_handshake *o2net_hand;
+ static struct o2net_msg *o2net_keep_req, *o2net_keep_resp;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ocfs2-15-fix-heartbeat-write.diff new/patches.suse/ocfs2-15-fix-heartbeat-write.diff
--- old/patches.suse/ocfs2-15-fix-heartbeat-write.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.suse/ocfs2-15-fix-heartbeat-write.diff 2007-10-10 19:26:14.000000000 +0200
@@ -0,0 +1,26 @@
+From: Jan Kara
+Subject: Fix heartbeat block writing
+Patch-mainline: Never (has different code)
+References: 300730
+
+vec_len was computed wrong when number of nodes was smaller than fits into
+the page and when vec_start was non-zero. This could lead to wrong update
+of heartbeat information and bogus error messages or even assertion failures.
+
+Signed-off-by: Jan Kara
+
+--- a/fs/ocfs2/cluster/disk_heartbeat.c 2007-10-10 15:28:00.000000000 +0200
++++ b/fs/ocfs2/cluster/disk_heartbeat.c 2007-10-10 16:05:18.000000000 +0200
+@@ -245,11 +245,9 @@ static struct bio *o2hb_setup_one_bio(st
+ current_page = cs / spp;
+ page = reg->hr_slot_data[current_page];
+
+- vec_len = min(PAGE_CACHE_SIZE,
++ vec_len = min(PAGE_CACHE_SIZE - vec_start,
+ (max_slots-cs) * (PAGE_CACHE_SIZE/spp) );
+
+- vec_len -= vec_start;
+-
+ mlog(ML_HB_BIO, "page %d, vec_len = %u, vec_start = %u\n",
+ current_page, vec_len, vec_start);
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-buffer-info-for-balance.diff new/patches.suse/reiserfs-buffer-info-for-balance.diff
--- old/patches.suse/reiserfs-buffer-info-for-balance.diff 2007-09-27 19:42:24.000000000 +0200
+++ new/patches.suse/reiserfs-buffer-info-for-balance.diff 2007-10-10 20:46:10.000000000 +0200
@@ -13,8 +13,8 @@
include/linux/reiserfs_fs.h | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
---- a/fs/reiserfs/do_balan.c 2007-09-27 12:50:04.000000000 -0400
-+++ b/fs/reiserfs/do_balan.c 2007-09-27 12:58:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/do_balan.c
++++ linux-2.6.22/fs/reiserfs/do_balan.c
@@ -449,8 +449,7 @@ static int balance_leaf(struct tree_bala
/* when we have merge directory item, pos_in_item has been changed too */
@@ -63,7 +63,7 @@
0,
pos_in_item
-
-@@ -1506,7 +1503,7 @@ static int balance_leaf(struct tree_bala
+@@ -1505,7 +1502,7 @@ static int balance_leaf(struct tree_bala
item_pos - n +
snum[i]);
if (is_direntry_le_ih(pasted)) {
@@ -72,7 +72,7 @@
item_pos -
n + snum[i],
pos_in_item,
-@@ -1607,7 +1604,7 @@ static int balance_leaf(struct tree_bala
+@@ -1606,7 +1603,7 @@ static int balance_leaf(struct tree_bala
zeros_num);
/* paste entry */
@@ -81,8 +81,8 @@
item_pos,
pos_in_item,
1,
---- a/fs/reiserfs/lbalance.c 2007-09-27 12:50:04.000000000 -0400
-+++ b/fs/reiserfs/lbalance.c 2007-09-27 12:59:47.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/lbalance.c
++++ linux-2.6.22/fs/reiserfs/lbalance.c
@@ -111,7 +111,7 @@ static void leaf_copy_dir_entries(struct
item_num_in_dest =
(last_first == FIRST_TO_LAST) ? (B_NR_ITEMS(dest) - 1) : 0;
@@ -92,7 +92,7 @@
(last_first ==
FIRST_TO_LAST) ? I_ENTRY_COUNT(B_N_PITEM_HEAD(dest,
item_num_in_dest))
-@@ -1194,7 +1194,7 @@ static void leaf_delete_items_entirely(s
+@@ -1191,7 +1191,7 @@ static void leaf_delete_items_entirely(s
}
/* paste new_entry_count entries (new_dehs, records) into position before to item_num-th item */
@@ -101,7 +101,7 @@
int item_num,
int before,
int new_entry_count,
-@@ -1206,6 +1206,7 @@ void leaf_paste_entries(struct buffer_he
+@@ -1203,6 +1203,7 @@ void leaf_paste_entries(struct buffer_he
struct reiserfs_de_head *deh;
char *insert_point;
int i, old_entry_num;
@@ -109,9 +109,9 @@
if (new_entry_count == 0)
return;
---- a/include/linux/reiserfs_fs.h 2007-09-27 12:50:05.000000000 -0400
-+++ b/include/linux/reiserfs_fs.h 2007-09-27 12:57:04.000000000 -0400
-@@ -2050,7 +2050,7 @@ void leaf_paste_in_buffer(struct buffer_
+--- linux-2.6.22.orig/include/linux/reiserfs_fs.h
++++ linux-2.6.22/include/linux/reiserfs_fs.h
+@@ -2017,7 +2017,7 @@ void leaf_paste_in_buffer(struct buffer_
int zeros_number);
void leaf_cut_from_buffer(struct buffer_info *bi, int cut_item_num,
int pos_in_item, int cut_size);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-reiserfs_panic.diff new/patches.suse/reiserfs-reiserfs_panic.diff
--- old/patches.suse/reiserfs-reiserfs_panic.diff 2007-08-27 20:13:30.000000000 +0200
+++ new/patches.suse/reiserfs-reiserfs_panic.diff 2007-10-10 20:46:10.000000000 +0200
@@ -32,8 +32,8 @@
include/linux/reiserfs_fs.h | 23 ++++++++++---
14 files changed, 212 insertions(+), 197 deletions(-)
---- a/fs/reiserfs/do_balan.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/do_balan.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/do_balan.c
++++ linux-2.6.22/fs/reiserfs/do_balan.c
@@ -153,8 +153,8 @@ static int balance_leaf_when_delete(stru
default:
@@ -45,7 +45,7 @@
(flag ==
M_PASTE) ? "PASTE" : ((flag ==
M_INSERT) ? "INSERT" :
-@@ -722,8 +722,8 @@ static int balance_leaf(struct tree_bala
+@@ -721,8 +721,8 @@ static int balance_leaf(struct tree_bala
}
break;
default: /* cases d and t */
@@ -56,7 +56,7 @@
(flag ==
M_DELETE) ? "DELETE" : ((flag ==
M_CUT)
-@@ -1136,8 +1136,8 @@ static int balance_leaf(struct tree_bala
+@@ -1134,8 +1134,8 @@ static int balance_leaf(struct tree_bala
}
break;
default: /* cases d and t */
@@ -67,7 +67,7 @@
(flag ==
M_DELETE) ? "DELETE" : ((flag ==
M_CUT) ? "CUT"
-@@ -1167,8 +1167,8 @@ static int balance_leaf(struct tree_bala
+@@ -1165,8 +1165,8 @@ static int balance_leaf(struct tree_bala
not set correctly */
if (tb->CFL[0]) {
if (!tb->CFR[0])
@@ -78,7 +78,7 @@
copy_key(B_N_PDELIM_KEY(tb->CFL[0], tb->lkey[0]),
B_N_PDELIM_KEY(tb->CFR[0], tb->rkey[0]));
do_balance_mark_internal_dirty(tb, tb->CFL[0], 0);
-@@ -1475,7 +1475,8 @@ static int balance_leaf(struct tree_bala
+@@ -1472,7 +1472,8 @@ static int balance_leaf(struct tree_bala
&& (pos_in_item != ih_item_len(ih)
|| tb->insert_size[0] <= 0))
reiserfs_panic(tb->tb_sb,
@@ -88,7 +88,7 @@
#endif /* CONFIG_REISERFS_CHECK */
ret_val =
-@@ -1535,8 +1536,8 @@ static int balance_leaf(struct tree_bala
+@@ -1532,8 +1533,8 @@ static int balance_leaf(struct tree_bala
}
break;
default: /* cases d and t */
@@ -99,7 +99,7 @@
(flag ==
M_DELETE) ? "DELETE" : ((flag ==
M_CUT) ? "CUT"
-@@ -1681,7 +1682,7 @@ static int balance_leaf(struct tree_bala
+@@ -1678,7 +1679,7 @@ static int balance_leaf(struct tree_bala
print_cur_tb("12285");
reiserfs_panic(tb->
tb_sb,
@@ -108,7 +108,7 @@
tb->
insert_size
[0]);
-@@ -1697,11 +1698,10 @@ static int balance_leaf(struct tree_bala
+@@ -1694,11 +1695,10 @@ static int balance_leaf(struct tree_bala
if (flag == M_PASTE && tb->insert_size[0]) {
print_cur_tb("12290");
reiserfs_panic(tb->tb_sb,
@@ -122,7 +122,7 @@
return 0;
} /* Leaf level of the tree is balanced (end of balance_leaf) */
-@@ -1732,8 +1732,7 @@ struct buffer_head *get_FEB(struct tree_
+@@ -1729,8 +1729,7 @@ struct buffer_head *get_FEB(struct tree_
break;
if (i == MAX_FEB_SIZE)
@@ -132,7 +132,7 @@
bi.tb = tb;
bi.bi_bh = first_b = tb->FEB[i];
-@@ -1776,7 +1775,7 @@ static void free_thrown(struct tree_bala
+@@ -1773,7 +1772,7 @@ static void free_thrown(struct tree_bala
if (buffer_dirty(tb->thrown[i]))
reiserfs_warning(tb->tb_sb, "reiserfs-12322",
"called with dirty buffer %d",
@@ -141,7 +141,7 @@
brelse(tb->thrown[i]); /* incremented in store_thrown */
reiserfs_free_block(tb->transaction_handle, NULL,
blocknr, 0);
-@@ -1873,8 +1872,8 @@ static void check_internal_node(struct s
+@@ -1870,8 +1869,8 @@ static void check_internal_node(struct s
for (i = 0; i <= B_NR_ITEMS(bh); i++, dc++) {
if (!is_reusable(s, dc_block_number(dc), 1)) {
print_cur_tb(mes);
@@ -152,7 +152,7 @@
dc, bh);
}
}
-@@ -1896,9 +1895,10 @@ static int check_before_balancing(struct
+@@ -1893,9 +1892,10 @@ static int check_before_balancing(struct
int retval = 0;
if (cur_tb) {
@@ -166,7 +166,7 @@
}
/* double check that buffers that we will modify are unlocked. (fix_nodes should already have
-@@ -1930,8 +1930,8 @@ static void check_after_balance_leaf(str
+@@ -1927,8 +1927,8 @@ static void check_after_balance_leaf(str
dc_size(B_N_CHILD
(tb->FL[0], get_left_neighbor_position(tb, 0)))) {
print_cur_tb("12221");
@@ -177,7 +177,7 @@
}
}
if (tb->rnum[0]) {
-@@ -1940,8 +1940,8 @@ static void check_after_balance_leaf(str
+@@ -1937,8 +1937,8 @@ static void check_after_balance_leaf(str
dc_size(B_N_CHILD
(tb->FR[0], get_right_neighbor_position(tb, 0)))) {
print_cur_tb("12222");
@@ -188,7 +188,7 @@
}
}
if (PATH_H_PBUFFER(tb->tb_path, 1) &&
-@@ -1966,8 +1966,7 @@ static void check_after_balance_leaf(str
+@@ -1963,8 +1963,7 @@ static void check_after_balance_leaf(str
(PATH_H_PBUFFER(tb->tb_path, 1),
PATH_H_POSITION(tb->tb_path, 1))),
right);
@@ -198,7 +198,7 @@
}
}
-@@ -2102,8 +2101,7 @@ void do_balance(struct tree_balance *tb,
+@@ -2099,8 +2098,7 @@ void do_balance(struct tree_balance *tb,
tb->need_balance_dirty = 0;
if (FILESYSTEM_CHANGED_TB(tb)) {
@@ -208,8 +208,8 @@
}
/* if we have no real work to do */
if (!tb->insert_size[0]) {
---- a/fs/reiserfs/file.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/file.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/file.c
++++ linux-2.6.22/fs/reiserfs/file.c
@@ -413,7 +413,8 @@ static int reiserfs_allocate_blocks_for_
(char *)zeros);
} else {
@@ -289,8 +289,8 @@
/* Find where this buffer ends */
block_end = block_start + inode->i_sb->s_blocksize;
if (block_start >= to)
---- a/fs/reiserfs/fix_node.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/fix_node.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/fix_node.c
++++ linux-2.6.22/fs/reiserfs/fix_node.c
@@ -135,8 +135,7 @@ static void create_virtual_node(struct t
vn->vn_free_ptr +=
op_create_vi(vn, vi, is_affected, tb->insert_size[0]);
@@ -444,8 +444,8 @@
}
#endif
---- a/fs/reiserfs/ibalance.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/ibalance.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/ibalance.c
++++ linux-2.6.22/fs/reiserfs/ibalance.c
@@ -105,8 +105,8 @@ static void internal_define_dest_src_inf
break;
@@ -479,8 +479,8 @@
/* S[h] = empty buffer from the list FEB. */
tbSh = get_FEB(tb);
blkh = B_BLK_HEAD(tbSh);
---- a/fs/reiserfs/inode.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/inode.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/inode.c
++++ linux-2.6.22/fs/reiserfs/inode.c
@@ -1295,8 +1295,7 @@ static void update_stat_data(struct tree
ih = PATH_PITEM_HEAD(path);
@@ -491,8 +491,8 @@
INODE_PKEY(inode), ih);
if (stat_data_v1(ih)) {
---- a/fs/reiserfs/item_ops.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/item_ops.c 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/item_ops.c
++++ linux-2.6.22/fs/reiserfs/item_ops.c
@@ -517,8 +517,9 @@ static int direntry_create_vi(struct vir
((is_affected
&& (vn->vn_mode == M_PASTE
@@ -515,8 +515,8 @@
dir_u->entry_count);
}
---- a/fs/reiserfs/journal.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/journal.c 2007-08-27 14:03:35.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/journal.c
++++ linux-2.6.22/fs/reiserfs/journal.c
@@ -438,8 +438,8 @@ void reiserfs_check_lock_depth(struct su
{
#ifdef CONFIG_SMP
@@ -674,8 +674,8 @@
}
atomic_set(&(journal->j_jlock), 0);
---- a/fs/reiserfs/lbalance.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/lbalance.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/lbalance.c
++++ linux-2.6.22/fs/reiserfs/lbalance.c
@@ -168,10 +168,11 @@ static int leaf_copy_boundary_item(struc
if (bytes_or_entries == ih_item_len(ih)
&& is_indirect_le_ih(ih))
@@ -732,8 +732,8 @@
zeros_number, paste_size);
}
#endif /* CONFIG_REISERFS_CHECK */
---- a/fs/reiserfs/namei.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/namei.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/namei.c
++++ linux-2.6.22/fs/reiserfs/namei.c
@@ -145,10 +145,9 @@ int search_by_entry_key(struct super_blo
if (!is_direntry_le_ih(de->de_ih) ||
COMP_SHORT_KEYS(&(de->de_ih->ih_key), key)) {
@@ -778,8 +778,8 @@
}
} else if (retval) {
int err = journal_end(&th, old_dir->i_sb, jbegin_count);
---- a/fs/reiserfs/objectid.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/objectid.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/objectid.c
++++ linux-2.6.22/fs/reiserfs/objectid.c
@@ -18,8 +18,7 @@
static void check_objectid_map(struct super_block *s, __le32 * map)
{
@@ -790,8 +790,8 @@
(long unsigned int)le32_to_cpu(map[0]));
// FIXME: add something else here
---- a/fs/reiserfs/prints.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/prints.c 2007-08-27 14:03:35.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/prints.c
++++ linux-2.6.22/fs/reiserfs/prints.c
@@ -356,11 +356,21 @@ void reiserfs_debug(struct super_block *
extern struct tree_balance *cur_tb;
#endif
@@ -857,8 +857,8 @@
}
---- a/fs/reiserfs/stree.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/stree.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/stree.c
++++ linux-2.6.22/fs/reiserfs/stree.c
@@ -366,9 +366,8 @@ inline void decrement_bcount(struct buff
put_bh(p_s_bh);
return;
@@ -963,8 +963,8 @@
found_ih, pos_in_item(path), p_s_key);
}
}
---- a/fs/reiserfs/tail_conversion.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/tail_conversion.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/tail_conversion.c
++++ linux-2.6.22/fs/reiserfs/tail_conversion.c
@@ -92,8 +92,7 @@ int direct2indirect(struct reiserfs_tran
last item of the file */
if (search_for_position_by_key(sb, &end_key, path) ==
@@ -996,8 +996,8 @@
#endif
}
---- a/include/linux/reiserfs_fs.h 2007-08-27 14:01:21.000000000 -0400
-+++ b/include/linux/reiserfs_fs.h 2007-08-27 14:03:35.000000000 -0400
+--- linux-2.6.22.orig/include/linux/reiserfs_fs.h
++++ linux-2.6.22/include/linux/reiserfs_fs.h
@@ -84,11 +84,11 @@ void __reiserfs_warning(struct super_blo
/* assertions handling */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-reiserfs-warning.diff new/patches.suse/reiserfs-reiserfs-warning.diff
--- old/patches.suse/reiserfs-reiserfs-warning.diff 2007-08-27 20:13:30.000000000 +0200
+++ new/patches.suse/reiserfs-reiserfs-warning.diff 2007-10-10 20:46:10.000000000 +0200
@@ -37,8 +37,8 @@
include/linux/reiserfs_fs.h | 9 +
17 files changed, 445 insertions(+), 425 deletions(-)
---- a/fs/reiserfs/bitmap.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/bitmap.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/bitmap.c
++++ linux-2.6.22/fs/reiserfs/bitmap.c
@@ -64,8 +64,8 @@ int is_reusable(struct super_block *s, b
unsigned int bmap_count = reiserfs_bmap_count(s);
@@ -162,9 +162,9 @@
return 1;
}
---- a/fs/reiserfs/do_balan.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/do_balan.c 2007-08-27 14:03:36.000000000 -0400
-@@ -1755,15 +1755,15 @@ static void store_thrown(struct tree_bal
+--- linux-2.6.22.orig/fs/reiserfs/do_balan.c
++++ linux-2.6.22/fs/reiserfs/do_balan.c
+@@ -1752,15 +1752,15 @@ static void store_thrown(struct tree_bal
int i;
if (buffer_dirty(bh))
@@ -183,7 +183,7 @@
}
static void free_thrown(struct tree_balance *tb)
-@@ -1774,8 +1774,8 @@ static void free_thrown(struct tree_bala
+@@ -1771,8 +1771,8 @@ static void free_thrown(struct tree_bala
if (tb->thrown[i]) {
blocknr = tb->thrown[i]->b_blocknr;
if (buffer_dirty(tb->thrown[i]))
@@ -194,7 +194,7 @@
blocknr);
brelse(tb->thrown[i]); /* incremented in store_thrown */
reiserfs_free_block(tb->transaction_handle, NULL,
-@@ -1880,13 +1880,12 @@ static void check_internal_node(struct s
+@@ -1877,13 +1877,12 @@ static void check_internal_node(struct s
}
}
@@ -211,7 +211,7 @@
return 1;
}
return 0;
-@@ -1905,18 +1904,19 @@ static int check_before_balancing(struct
+@@ -1902,18 +1901,19 @@ static int check_before_balancing(struct
/* double check that buffers that we will modify are unlocked. (fix_nodes should already have
prepped all of these for us). */
if (tb->lnum[0]) {
@@ -238,7 +238,7 @@
check_leaf(PATH_PLAST_BUFFER(tb->tb_path));
return retval;
-@@ -1955,7 +1955,7 @@ static void check_after_balance_leaf(str
+@@ -1952,7 +1952,7 @@ static void check_after_balance_leaf(str
PATH_H_POSITION(tb->tb_path,
1))));
print_cur_tb("12223");
@@ -247,7 +247,7 @@
"B_FREE_SPACE (PATH_H_PBUFFER(tb->tb_path,0)) = %d; "
"MAX_CHILD_SIZE (%d) - dc_size( %y, %d ) [%d] = %d",
left,
-@@ -2107,9 +2107,8 @@ void do_balance(struct tree_balance *tb,
+@@ -2104,9 +2104,8 @@ void do_balance(struct tree_balance *tb,
}
/* if we have no real work to do */
if (!tb->insert_size[0]) {
@@ -259,8 +259,8 @@
unfix_nodes(tb);
return;
}
---- a/fs/reiserfs/file.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/file.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/file.c
++++ linux-2.6.22/fs/reiserfs/file.c
@@ -76,7 +76,7 @@ static int reiserfs_file_release(struct
* and let the admin know what is going on.
*/
@@ -300,8 +300,8 @@
"called with zero number of pages to process");
return -EFAULT;
}
---- a/fs/reiserfs/fix_node.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/fix_node.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/fix_node.c
++++ linux-2.6.22/fs/reiserfs/fix_node.c
@@ -496,8 +496,8 @@ static int get_num_ver(int mode, struct
snum012[needed_nodes - 1 + 3] = units;
@@ -337,8 +337,8 @@
"(%b)", locked);
/* Don't loop forever. Try to recover from possible error. */
---- a/fs/reiserfs/inode.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/inode.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/inode.c
++++ linux-2.6.22/fs/reiserfs/inode.c
@@ -838,7 +838,8 @@ int reiserfs_get_block(struct inode *ino
if (retval) {
if (retval != -ENOSPC)
@@ -510,8 +510,8 @@
retval = -EIO;
goto out;
}
---- a/fs/reiserfs/item_ops.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/item_ops.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/item_ops.c
++++ linux-2.6.22/fs/reiserfs/item_ops.c
@@ -97,7 +97,8 @@ static int sd_unit_num(struct virtual_it
static void sd_print_vi(struct virtual_item *vi)
@@ -673,8 +673,8 @@
}
static struct item_operations errcatch_ops = {
---- a/fs/reiserfs/journal.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/journal.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/journal.c
++++ linux-2.6.22/fs/reiserfs/journal.c
@@ -302,8 +302,8 @@ int reiserfs_allocate_list_bitmaps(struc
jb->journal_list = NULL;
jb->bitmaps = vmalloc(mem);
@@ -1136,9 +1136,9 @@
brelse(cn->bh);
}
next = cn->next;
---- a/fs/reiserfs/lbalance.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/lbalance.c 2007-08-27 14:03:36.000000000 -0400
-@@ -1287,12 +1287,16 @@ void leaf_paste_entries(struct buffer_he
+--- linux-2.6.22.orig/fs/reiserfs/lbalance.c
++++ linux-2.6.22/fs/reiserfs/lbalance.c
+@@ -1288,12 +1288,16 @@ void leaf_paste_entries(struct buffer_in
prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0;
if (prev && prev <= deh_location(&(deh[i])))
@@ -1159,8 +1159,8 @@
ih, i, deh + i, deh + i + 1);
}
}
---- a/fs/reiserfs/namei.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/namei.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/namei.c
++++ linux-2.6.22/fs/reiserfs/namei.c
@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_blo
switch (retval) {
case ITEM_NOT_FOUND:
@@ -1269,8 +1269,8 @@
old_dir->i_size -= DEH_SIZE + old_de.de_entrylen;
---- a/fs/reiserfs/objectid.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/objectid.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/objectid.c
++++ linux-2.6.22/fs/reiserfs/objectid.c
@@ -61,7 +61,7 @@ __u32 reiserfs_get_unused_objectid(struc
/* comment needed -Hans */
unused_objectid = le32_to_cpu(map[1]);
@@ -1290,8 +1290,8 @@
(long unsigned)objectid_to_release);
}
---- a/fs/reiserfs/prints.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/prints.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/prints.c
++++ linux-2.6.22/fs/reiserfs/prints.c
@@ -264,14 +264,17 @@ static void prepare_error_buf(const char
va_end( args );\
}
@@ -1314,8 +1314,8 @@
}
/* No newline.. reiserfs_info calls can be followed by printk's */
---- a/fs/reiserfs/procfs.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/procfs.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/procfs.c
++++ linux-2.6.22/fs/reiserfs/procfs.c
@@ -514,7 +514,7 @@ int reiserfs_proc_info_init(struct super
add_file(sb, "journal", show_journal);
return 0;
@@ -1335,8 +1335,8 @@
proc_info_root_name);
return 1;
}
---- a/fs/reiserfs/stree.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/stree.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/stree.c
++++ linux-2.6.22/fs/reiserfs/stree.c
@@ -444,23 +444,24 @@ static int is_leaf(char *buf, int blocks
blkh = (struct block_head *)buf;
@@ -1613,8 +1613,8 @@
"key %K already exists in the tree",
key);
retval = -EEXIST;
---- a/fs/reiserfs/super.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/super.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/super.c
++++ linux-2.6.22/fs/reiserfs/super.c
@@ -178,9 +178,9 @@ static int finish_unfinished(struct supe
if (REISERFS_SB(s)->s_qf_names[i]) {
int ret = reiserfs_quota_on_mount(s, i);
@@ -2229,8 +2229,8 @@
"Journalled quota will not work.");
path_release(&nd);
return vfs_quota_on(sb, type, format_id, path);
---- a/fs/reiserfs/tail_conversion.c 2007-08-02 18:13:48.000000000 -0400
-+++ b/fs/reiserfs/tail_conversion.c 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/tail_conversion.c
++++ linux-2.6.22/fs/reiserfs/tail_conversion.c
@@ -48,9 +48,9 @@ int direct2indirect(struct reiserfs_tran
// FIXME: we could avoid this
@@ -2244,8 +2244,8 @@
pathrelse(path);
return -EIO;
}
---- a/fs/reiserfs/xattr.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/xattr.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/xattr.c
++++ linux-2.6.22/fs/reiserfs/xattr.c
@@ -278,7 +278,8 @@ static int __xattr_readdir(struct file *
ih = de.de_ih;
@@ -2316,8 +2316,8 @@
err = -EOPNOTSUPP;
}
}
---- a/include/linux/reiserfs_fs.h 2007-08-27 14:01:21.000000000 -0400
-+++ b/include/linux/reiserfs_fs.h 2007-08-27 14:03:36.000000000 -0400
+--- linux-2.6.22.orig/include/linux/reiserfs_fs.h
++++ linux-2.6.22/include/linux/reiserfs_fs.h
@@ -77,7 +77,10 @@
*/
#define REISERFS_DEBUG_CODE 5 /* extra messages to help find/debug errors */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-strip-whitespace.diff new/patches.suse/reiserfs-strip-whitespace.diff
--- old/patches.suse/reiserfs-strip-whitespace.diff 2007-08-27 20:13:30.000000000 +0200
+++ new/patches.suse/reiserfs-strip-whitespace.diff 2007-10-10 20:46:10.000000000 +0200
@@ -27,8 +27,8 @@
include/linux/reiserfs_fs_sb.h | 14 ++--
19 files changed, 189 insertions(+), 189 deletions(-)
---- a/fs/reiserfs/README 2007-08-02 18:13:44.000000000 -0400
-+++ b/fs/reiserfs/README 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/README
++++ linux-2.6.22/fs/reiserfs/README
@@ -1,4 +1,4 @@
-[LICENSING]
+[LICENSING]
@@ -44,8 +44,8 @@
Finally, nothing in this license shall be interpreted to allow you to
fail to fairly credit me, or to remove my credits, without my
---- a/fs/reiserfs/do_balan.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/do_balan.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/do_balan.c
++++ linux-2.6.22/fs/reiserfs/do_balan.c
@@ -39,21 +39,21 @@ inline void do_balance_mark_leaf_dirty(s
#define do_balance_mark_internal_dirty do_balance_mark_leaf_dirty
#define do_balance_mark_sb_dirty do_balance_mark_leaf_dirty
@@ -90,7 +90,7 @@
it is the number of entries from the item that are shifted into S_new
else
it is the number of bytes from the item that are shifted into S_new
-@@ -2036,7 +2036,7 @@ static inline void do_balance_starts(str
+@@ -2033,7 +2033,7 @@ static inline void do_balance_starts(str
/* store_print_tb (tb); */
/* do not delete, just comment it out */
@@ -99,8 +99,8 @@
"check");*/
RFALSE(check_before_balancing(tb), "PAP-12340: locked buffers in TB");
#ifdef CONFIG_REISERFS_CHECK
---- a/fs/reiserfs/file.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/file.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/file.c
++++ linux-2.6.22/fs/reiserfs/file.c
@@ -20,14 +20,14 @@
** insertion/balancing, for files that are written in one write.
** It avoids unnecessary tail packings (balances) for files that are written in
@@ -155,8 +155,8 @@
generic_file_write() is only appropriate for filesystems that are not seeking to optimize performance and want
something simple that works. It is not for serious use by general purpose filesystems, excepting the one that it was
---- a/fs/reiserfs/fix_node.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/fix_node.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/fix_node.c
++++ linux-2.6.22/fs/reiserfs/fix_node.c
@@ -30,8 +30,8 @@
** get_direct_parent
** get_neighbors
@@ -297,8 +297,8 @@
*/
int fix_nodes(int n_op_mode, struct tree_balance *p_s_tb, struct item_head *p_s_ins_ih, // item head of item being inserted
---- a/fs/reiserfs/hashes.c 2007-08-02 18:13:44.000000000 -0400
-+++ b/fs/reiserfs/hashes.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/hashes.c
++++ linux-2.6.22/fs/reiserfs/hashes.c
@@ -7,7 +7,7 @@
* (see Applied Cryptography, 2nd edition, p448).
*
@@ -308,8 +308,8 @@
* Jeremy has agreed to the contents of reiserfs/README. -Hans
* Yura's function is added (04/07/2000)
*/
---- a/fs/reiserfs/ibalance.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/ibalance.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/ibalance.c
++++ linux-2.6.22/fs/reiserfs/ibalance.c
@@ -278,7 +278,7 @@ static void internal_delete_childs(struc
/* copy cpy_num node pointers and cpy_num - 1 items from buffer src to buffer dest
@@ -355,8 +355,8 @@
{
it is the position of the leftmost pointer that must be deleted (together with
its corresponding key to the left of the pointer)
---- a/fs/reiserfs/inode.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/inode.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/inode.c
++++ linux-2.6.22/fs/reiserfs/inode.c
@@ -48,7 +48,7 @@ void reiserfs_delete_inode(struct inode
/* Do quota update inside a transaction for journaled quotas. We must do that
* after delete_object so that quota updates go into the same transaction as
@@ -541,8 +541,8 @@
* writeback
*/
ClearPageUptodate(page);
---- a/fs/reiserfs/ioctl.c 2007-08-02 18:13:44.000000000 -0400
-+++ b/fs/reiserfs/ioctl.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/ioctl.c
++++ linux-2.6.22/fs/reiserfs/ioctl.c
@@ -166,7 +166,7 @@ static int reiserfs_unpack(struct inode
}
@@ -552,8 +552,8 @@
** reiserfs_get_block to unpack the tail for us.
*/
index = inode->i_size >> PAGE_CACHE_SHIFT;
---- a/fs/reiserfs/journal.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/journal.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/journal.c
++++ linux-2.6.22/fs/reiserfs/journal.c
@@ -1,36 +1,36 @@
/*
** Write ahead logging implementation copyright Chris Mason 2000
@@ -951,8 +951,8 @@
*/
first_jl:
list_for_each_safe(entry, safe, &journal->j_journal_list) {
---- a/fs/reiserfs/lbalance.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/lbalance.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/lbalance.c
++++ linux-2.6.22/fs/reiserfs/lbalance.c
@@ -119,8 +119,8 @@ static void leaf_copy_dir_entries(struct
DEH_SIZE * copy_count + copy_records_len);
}
@@ -1018,7 +1018,7 @@
when cut item is part of directory
pos_in_item - number of first deleted entry
cut_size - count of deleted entries
-@@ -1274,7 +1274,7 @@ void leaf_paste_entries(struct buffer_he
+@@ -1275,7 +1275,7 @@ void leaf_paste_entries(struct buffer_in
/* change item key if necessary (when we paste before 0-th entry */
if (!before) {
set_le_ih_k_offset(ih, deh_offset(new_dehs));
@@ -1027,8 +1027,8 @@
&new_dehs->deh_offset, SHORT_KEY_SIZE);*/
}
#ifdef CONFIG_REISERFS_CHECK
---- a/fs/reiserfs/namei.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/namei.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/namei.c
++++ linux-2.6.22/fs/reiserfs/namei.c
@@ -106,7 +106,7 @@ key of the first directory entry in it.
This function first calls search_by_key, then, if item whose first
entry matches is not found it looks for the entry inside directory
@@ -1138,8 +1138,8 @@
set_ino_in_dir_entry(&dot_dot_de, INODE_PKEY(new_dir));
journal_mark_dirty(&th, new_dir->i_sb, dot_dot_de.de_bh);
---- a/fs/reiserfs/objectid.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/objectid.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/objectid.c
++++ linux-2.6.22/fs/reiserfs/objectid.c
@@ -181,7 +181,7 @@ int reiserfs_convert_objectid_map_v1(str
if (cur_size > new_size) {
@@ -1149,8 +1149,8 @@
*/
objectid_map[new_size - 1] = objectid_map[cur_size - 1];
set_sb_oid_cursize(disk_sb, new_size);
---- a/fs/reiserfs/prints.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/prints.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/prints.c
++++ linux-2.6.22/fs/reiserfs/prints.c
@@ -181,11 +181,11 @@ static char *is_there_reiserfs_struct(ch
appropriative printk. With this reiserfs_warning you can use format
specification for complex structures like you used to do with
@@ -1206,8 +1206,8 @@
Numbering scheme for panic used by Vladimir and Anatoly( Hans completely ignores this scheme, and considers it
pointless complexity):
---- a/fs/reiserfs/procfs.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/procfs.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/procfs.c
++++ linux-2.6.22/fs/reiserfs/procfs.c
@@ -645,7 +645,7 @@ int reiserfs_global_version_in_proc(char
*
*/
@@ -1217,8 +1217,8 @@
* Make Linus happy.
* Local variables:
* c-indentation-style: "K&R"
---- a/fs/reiserfs/resize.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/resize.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/resize.c
++++ linux-2.6.22/fs/reiserfs/resize.c
@@ -1,8 +1,8 @@
-/*
+/*
@@ -1239,8 +1239,8 @@
** old one
*/
node_tmp = jb->bitmaps;
---- a/fs/reiserfs/stree.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/stree.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/stree.c
++++ linux-2.6.22/fs/reiserfs/stree.c
@@ -77,7 +77,7 @@ inline void copy_item_head(struct item_h
/* k1 is pointer to on-disk structure which is stored in little-endian
form. k2 is pointer to cpu variable. For key of items of the same
@@ -1277,8 +1277,8 @@
** many more blocks than a transaction can hold. So, we do a polite
** journal end here, and if the transaction needs ending, we make
** sure the file is consistent before ending the current trans
---- a/fs/reiserfs/super.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/super.c 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/super.c
++++ linux-2.6.22/fs/reiserfs/super.c
@@ -739,7 +739,7 @@ static int reiserfs_getopt(struct super_
char **opt_arg, unsigned long *bit_flags)
{
@@ -1317,8 +1317,8 @@
** the super
*/
if (code != UNSET_HASH &&
---- a/fs/reiserfs/tail_conversion.c 2007-08-27 14:01:22.000000000 -0400
-+++ b/fs/reiserfs/tail_conversion.c 2007-08-27 14:03:29.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/tail_conversion.c
++++ linux-2.6.22/fs/reiserfs/tail_conversion.c
@@ -46,7 +46,7 @@ int direct2indirect(struct reiserfs_tran
/* Set the key to search for the place for new unfm pointer */
make_cpu_key(&end_key, inode, tail_offset, TYPE_INDIRECT, 4);
@@ -1328,8 +1328,8 @@
if (search_for_position_by_key(sb, &end_key, path) == POSITION_FOUND) {
reiserfs_error(sb, "PAP-14030",
"pasted or inserted byte exists in "
---- a/include/linux/reiserfs_fs_sb.h 2007-08-27 14:01:22.000000000 -0400
-+++ b/include/linux/reiserfs_fs_sb.h 2007-08-27 14:01:22.000000000 -0400
+--- linux-2.6.22.orig/include/linux/reiserfs_fs_sb.h
++++ linux-2.6.22/include/linux/reiserfs_fs_sb.h
@@ -14,7 +14,7 @@ typedef enum {
} reiserfs_super_block_flags;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/reiserfs-use-reiserfs_error.diff new/patches.suse/reiserfs-use-reiserfs_error.diff
--- old/patches.suse/reiserfs-use-reiserfs_error.diff 2007-09-27 19:42:24.000000000 +0200
+++ new/patches.suse/reiserfs-use-reiserfs_error.diff 2007-10-10 20:46:10.000000000 +0200
@@ -8,20 +8,20 @@
--
- fs/reiserfs/bitmap.c | 57 +++++++++++++++++-----------------
- fs/reiserfs/file.c | 14 ++++----
- fs/reiserfs/inode.c | 43 ++++++++++++-------------
- fs/reiserfs/lbalance.c | 20 ++++++------
- fs/reiserfs/namei.c | 24 +++++++-------
+ fs/reiserfs/bitmap.c | 57 +++++++++++++++++++++---------------------
+ fs/reiserfs/file.c | 14 +++++-----
+ fs/reiserfs/inode.c | 43 ++++++++++++++-----------------
+ fs/reiserfs/lbalance.c | 20 +++++++-------
+ fs/reiserfs/namei.c | 24 ++++++++---------
fs/reiserfs/objectid.c | 4 +-
- fs/reiserfs/stree.c | 70 +++++++++++++++++++++---------------------
- fs/reiserfs/super.c | 15 ++++-----
- fs/reiserfs/tail_conversion.c | 6 +--
- fs/reiserfs/xattr.c | 21 ++++++------
- 10 files changed, 135 insertions(+), 139 deletions(-)
+ fs/reiserfs/stree.c | 26 +++++++++----------
+ fs/reiserfs/super.c | 15 +++++------
+ fs/reiserfs/tail_conversion.c | 6 ++--
+ fs/reiserfs/xattr.c | 21 +++++++--------
+ 10 files changed, 113 insertions(+), 117 deletions(-)
---- a/fs/reiserfs/bitmap.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/bitmap.c 2007-08-27 14:01:21.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/bitmap.c
++++ linux-2.6.22/fs/reiserfs/bitmap.c
@@ -64,9 +64,9 @@ int is_reusable(struct super_block *s, b
unsigned int bmap_count = reiserfs_bmap_count(s);
@@ -155,8 +155,8 @@
}
struct buffer_head *reiserfs_read_bitmap_block(struct super_block *sb,
---- a/fs/reiserfs/file.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/file.c 2007-08-27 14:03:32.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/file.c
++++ linux-2.6.22/fs/reiserfs/file.c
@@ -395,7 +395,7 @@ static int reiserfs_allocate_blocks_for_
if (res != ITEM_NOT_FOUND) {
/* item should not exist, otherwise we have error */
@@ -192,8 +192,8 @@
}
res = -EIO;
goto error_exit_free_blocks;
---- a/fs/reiserfs/inode.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/inode.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/inode.c
++++ linux-2.6.22/fs/reiserfs/inode.c
@@ -837,11 +837,11 @@ int reiserfs_get_block(struct inode *ino
tail_offset);
if (retval) {
@@ -286,9 +286,9 @@
page = NULL;
bh = NULL;
}
---- a/fs/reiserfs/lbalance.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/lbalance.c 2007-08-27 14:03:30.000000000 -0400
-@@ -1290,17 +1290,17 @@ void leaf_paste_entries(struct buffer_he
+--- linux-2.6.22.orig/fs/reiserfs/lbalance.c
++++ linux-2.6.22/fs/reiserfs/lbalance.c
+@@ -1291,17 +1291,17 @@ void leaf_paste_entries(struct buffer_in
prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0;
if (prev && prev <= deh_location(&(deh[i])))
@@ -316,8 +316,8 @@
}
}
#endif
---- a/fs/reiserfs/namei.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/namei.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/namei.c
++++ linux-2.6.22/fs/reiserfs/namei.c
@@ -120,8 +120,8 @@ int search_by_entry_key(struct super_blo
switch (retval) {
case ITEM_NOT_FOUND:
@@ -384,8 +384,8 @@
old_dir->i_size -= DEH_SIZE + old_de.de_entrylen;
---- a/fs/reiserfs/objectid.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/objectid.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/objectid.c
++++ linux-2.6.22/fs/reiserfs/objectid.c
@@ -160,8 +160,8 @@ void reiserfs_release_objectid(struct re
i += 2;
}
@@ -397,8 +397,8 @@
}
int reiserfs_convert_objectid_map_v1(struct super_block *s)
---- a/fs/reiserfs/stree.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/stree.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/stree.c
++++ linux-2.6.22/fs/reiserfs/stree.c
@@ -720,9 +720,9 @@ int search_by_key(struct super_block *p_
// make sure, that the node contents look like a node of
// certain level
@@ -457,8 +457,8 @@
err = -EIO;
goto out;
---- a/fs/reiserfs/super.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/super.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/super.c
++++ linux-2.6.22/fs/reiserfs/super.c
@@ -190,9 +190,8 @@ static int finish_unfinished(struct supe
while (!retval) {
retval = search_item(s, &max_cpu_key, &path);
@@ -495,8 +495,8 @@
} else {
if (truncate)
REISERFS_I(inode)->i_flags |=
---- a/fs/reiserfs/tail_conversion.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/tail_conversion.c 2007-08-27 14:03:30.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/tail_conversion.c
++++ linux-2.6.22/fs/reiserfs/tail_conversion.c
@@ -48,9 +48,9 @@ int direct2indirect(struct reiserfs_tran
// FIXME: we could avoid this
@@ -510,8 +510,8 @@
pathrelse(path);
return -EIO;
}
---- a/fs/reiserfs/xattr.c 2007-08-27 14:01:21.000000000 -0400
-+++ b/fs/reiserfs/xattr.c 2007-08-27 14:03:34.000000000 -0400
+--- linux-2.6.22.orig/fs/reiserfs/xattr.c
++++ linux-2.6.22/fs/reiserfs/xattr.c
@@ -278,8 +278,8 @@ static int __xattr_readdir(struct file *
ih = de.de_ih;
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++ 2691 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-10-06 08:28:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-10-11 20:02:27.000000000 +0200
@@ -36,6 +36,7 @@
patches.kernel.org/patch-2.6.22.6-7
patches.kernel.org/patch-2.6.22.7-8
patches.kernel.org/patch-2.6.22.8-9
+ patches.kernel.org/patch-2.6.22.9-10
########################################################
# kABI consistency patches
@@ -95,7 +96,6 @@
########################################################
# i386
########################################################
- patches.fixes/i386-use-global-flag-to-disable-broken-local-apic-timer-on-AMD-cpus.diff
patches.fixes/i386-fixup-TRACE_IRQ-breakage
# amd64 | x86-64 | x86_64
@@ -419,6 +419,8 @@
patches.suse/ocfs2-11-user-heartbeat.diff
patches.suse/ocfs2-12-incorporate-disk-heartbeat.diff
patches.suse/ocfs2-13-fix-quorum-work.diff
+ patches.suse/ocfs2-14-fix-notifier-hang.diff
+ patches.suse/ocfs2-15-fix-heartbeat-write.diff
########################################################
# other filesystem stuff
@@ -448,11 +450,6 @@
#
########################################################
- patches.drivers/e1000-7.6.5.patch
- patches.drivers/e1000-7.6.5-napi-tail.patch
- patches.drivers/e1000e.patch
- patches.fixes/sky2-tx-sum-resume.patch
-
########################################################
# Storage
########################################################
@@ -517,6 +514,7 @@
patches.drivers/libata-improve-hpa-failure-handling
patches.drivers/libata-ata_piix-suspend-workaround-for-toshiba-laptops
patches.drivers/libata-ata_piix-implement-IOCFG-bit18-quirk
+ patches.drivers/libata-ata_piix-properly_terminate_DMI_system_list
patches.drivers/libata-pata_it821x-fix-initialization-bug
patches.drivers/libata-sata_via-fix-write-errors-on-PATA-drive-connected-to-VT6421
patches.drivers/libata-more-machines-for-short-cable-list
@@ -543,6 +541,10 @@
patches.suse/nameif-track-rename.patch
patches.suse/bonding-workqueue
patches.suse/bonding-bh-locking
+ patches.drivers/e1000-7.6.5.patch
+ patches.drivers/e1000-7.6.5-napi-tail.patch
+ patches.drivers/e1000e.patch
+ patches.fixes/natsemi_removal.fix
########################################################
# Wireless Networking
@@ -830,8 +832,11 @@
-RT patches.xen/xen3-patch-2.6.20
-RT patches.xen/xen3-patch-2.6.21
-RT patches.xen/xen3-patch-2.6.22
+-RT patches.xen/xen3-patch-2.6.22.5-6
+-RT patches.xen/xen3-patch-2.6.22.6-7
-RT patches.xen/xen3-x86-early-quirks-unificiation
-RT patches.xen/xen3-x86-fam10-l3cache
+-RT patches.xen/xen3-aux-at_vector_size.patch
-RT patches.xen/xen3-sysfs-crash-debugging.patch
+andrea patches.xen/xen3-silent-stack-overflow
@@ -860,7 +865,6 @@
-RT patches.xen/xen-intel-agp
-RT patches.xen/xen-blkback-cdrom
-RT patches.xen/xen-isa-dma
--RT patches.xen/handle-bogus-cs-selector-in-single-step-instruction-decoding
# RT
+RT patches.rt/patch-2.6.22.1-rt4.openSUSE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org