Hello community,
here is the log from the commit of package kernel-source
checked in at Sat Aug 25 00:45:56 CEST 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-08-20 18:50:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-08-24 09:01:26.000000000 +0200
@@ -1,0 +2,90 @@
+Thu Aug 23 14:46:01 CEST 2007 - olh@suse.de
+
+- add patches.suse/squashfs.patch to simplify installation debugging
+
+-------------------------------------------------------------------
+Thu Aug 23 13:36:00 CEST 2007 - sven@suse.de
+
+- Update config files: sync x86_64 default->rt
+ and debug->rt_debug
+
+-------------------------------------------------------------------
+Thu Aug 23 13:03:44 CEST 2007 - bwalle@suse.de
+
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+
+-------------------------------------------------------------------
+Thu Aug 23 09:52:22 CEST 2007 - olh@suse.de
+
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+
+-------------------------------------------------------------------
+Thu Aug 23 08:27:06 CEST 2007 - sdietrich@suse.de
+
+- Update RT config files: sync NET settings
+
+-------------------------------------------------------------------
+Thu Aug 23 02:39:19 CEST 2007 - gregkh@suse.de
+
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+
+-------------------------------------------------------------------
+Wed Aug 22 22:05:08 CEST 2007 - sdietrich@suse.de
+
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+
+-------------------------------------------------------------------
+Wed Aug 22 16:56:05 CEST 2007 - olh@suse.de
+
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+
+-------------------------------------------------------------------
+Wed Aug 22 14:45:19 CEST 2007 - olh@suse.de
+
+- reduce ps3fb memsize from 18MB to 9MB
+
+-------------------------------------------------------------------
+Wed Aug 22 09:21:11 CEST 2007 - jbeulich@novell.com
+
+- Also resync Xen configs.
+
+-------------------------------------------------------------------
+Tue Aug 21 14:43:15 CEST 2007 - olh@suse.de
+
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+
+-------------------------------------------------------------------
+Tue Aug 21 14:19:32 CEST 2007 - tiwai@suse.de
+
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+
+-------------------------------------------------------------------
+Tue Aug 21 07:27:09 CEST 2007 - teheo@suse.de
+
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+
+-------------------------------------------------------------------
+Tue Aug 21 07:13:53 CEST 2007 - gregkh@suse.de
+
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+
+-------------------------------------------------------------------
+Tue Aug 21 07:10:37 CEST 2007 - gregkh@suse.de
+
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
+
+-------------------------------------------------------------------
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.Eg4788/_old 2007-08-25 00:42:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.22.3)
+# spec file for package kernel-bigsmp (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
Provides: k_smp4G
@@ -170,12 +170,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-bigsmp-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -264,7 +264,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.22.3)
+# spec file for package kernel-debug (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -175,12 +175,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-debug-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-debug-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -269,7 +269,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.22.3)
+# spec file for package kernel-default (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch alpha
@@ -196,12 +196,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-default-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-default-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -290,7 +290,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:57.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.22.3)
+# spec file for package kernel-dummy (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+Release: 1
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%install
@@ -41,6 +41,51 @@
/etc/dummy
%changelog
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.suse/squashfs.patch to simplify installation debugging
+* Thu Aug 23 2007 - sven@suse.de
+- Update config files: sync x86_64 default->rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.22.3)
+# spec file for package kernel-kdump (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch ppc
@@ -174,12 +174,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-kdump-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -268,7 +268,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.22.3)
+# spec file for package kernel-ppc64 (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch ppc
@@ -186,12 +186,12 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-ppc64-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -280,7 +280,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-rt_debug.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-rt_debug (Version 2.6.22.3)
+# spec file for package kernel-rt_debug (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -172,12 +172,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-rt_debug-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-rt_debug-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -266,7 +266,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-rt.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-rt (Version 2.6.22.3)
+# spec file for package kernel-rt (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -177,12 +177,12 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-rt-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-rt-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -271,7 +271,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:58.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.22.3)
+# spec file for package kernel-s390 (Version 2.6.22.5)
#
# 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.3
-Release: 4
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
Provides: kernel-32bit k_deflt
@@ -168,12 +168,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-s390-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-s390-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -262,7 +262,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.22.3)
+# spec file for package kernel-source (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+Release: 1
License: GPL v2 or later
Group: Development/Sources
Autoreqprov: off
@@ -31,7 +31,7 @@
BuildRequires: kernel-dummy
%endif
Provides: linux
-Provides: kernel-source = 2.6.22.3-%source_rel
+Provides: kernel-source = 2.6.22.5-%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
@@ -106,7 +106,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -129,16 +129,16 @@
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.22.3/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.22.3/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22.3/$patch; then
+ > %_builddir/kernel-source-2.6.22.5/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.22.5/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22.5/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22.3 %source_rel
-KERNELRELEASE=2.6.22.3-%source_rel
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22.5 %source_rel
+KERNELRELEASE=2.6.22.5-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.22.3/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.22.3/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.22.5/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.22.5/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -183,7 +183,11 @@
%endif
make prepare $MAKE_ARGS
make scripts $MAKE_ARGS
- krel=$(make kernelrelease $MAKE_ARGS)
+ krel=$(make -s kernelrelease $MAKE_ARGS)
+ if [ $KERNELRELEASE != "${krel%%-*}" ]; then
+ echo "Kernel release mismatch: $KERNELRELEASE != ${krel%%-*}" >&2
+ exit 1
+ fi
mkdir -p ../../../lib/modules/$krel/
ln -s ../../../usr/src/linux-$KERNELRELEASE \
../../../lib/modules/$krel/source
@@ -277,6 +281,51 @@
%files -f kernel-source.files
%changelog
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.suse/squashfs.patch to simplify installation debugging
+* Thu Aug 23 2007 - sven@suse.de
+- Update config files: sync x86_64 default->rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.22.3)
+# spec file for package kernel-syms (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Requires: kernel-source = 2.6.22.5-%source_rel
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -96,7 +96,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -150,6 +150,51 @@
/lib/modules/*/*
%changelog
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.suse/squashfs.patch to simplify installation debugging
+* Thu Aug 23 2007 - sven@suse.de
+- Update config files: sync x86_64 default->rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.22.3)
+# spec file for package kernel-vanilla (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch alpha
@@ -188,12 +188,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-vanilla-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -282,7 +282,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xenpae (Version 2.6.22.3)
+# spec file for package kernel-xenpae (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2
@@ -171,12 +171,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-xenpae-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-xenpae-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -265,7 +265,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.Eg4788/_old 2007-08-25 00:42:59.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg4788/_new 2007-08-25 00:42:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-xen (Version 2.6.22.3)
+# spec file for package kernel-xen (Version 2.6.22.5)
#
# 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.3
-Release: 6
+Version: 2.6.22.5
+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.3-%source_rel
+Provides: kernel = 2.6.22.5-%source_rel
%endif
%endif
%ifarch %ix86
@@ -174,12 +174,12 @@
-Source Timestamp: 2007/08/20 16:50:09 UTC
+Source Timestamp: 2007/08/23 12:56:03 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
- echo "The kernel-xen-2.6.22.3.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.22.3.src.rpm."
+ echo "The kernel-xen-2.6.22.5.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.22.5.src.rpm."
exit 1
fi
echo "Architecture symbol(s):" %symbols
@@ -268,7 +268,12 @@
rm .config.orig
%endif
make prepare $MAKE_ARGS
-KERNELRELEASE=$(make -s kernelrelease)
+KERNELRELEASE=$(make -s kernelrelease $MAKE_ARGS)
+if [ 2.6.22.5-%source_rel != ${KERNELRELEASE%%-*} ]; then
+ echo "Kernel release mismatch: 2.6.22.5-%source_rel" \
+ "!= ${KERNELRELEASE%%-*}" >&2
+ exit 1
+fi
echo "KERNELRELEASE=$KERNELRELEASE" >> ../.rpm-defs
cat > .kernel-binary.spec.buildenv <rt
+ and debug->rt_debug
+* Thu Aug 23 2007 - bwalle@suse.de
+- rpm/post.sh:
+ o Added check for /etc/sysconfig/bootloader before executing
+ bootloader_entry to preventing installation errors in case of
+ shared boot partitions. (#303734)
+ o Also execute mkinitrd if bootloader files missing, this problem
+ has been introduced with last change.
+* Thu Aug 23 2007 - olh@suse.de
+- add patches.arch/ppc-ps3-video-synmaster.patch
+ handle another monitor properly
+* Thu Aug 23 2007 - sdietrich@suse.de
+- Update RT config files: sync NET settings
+* Thu Aug 23 2007 - gregkh@suse.de
+- Update to 2.6.22.5 which fixed a lot of bugs and caused the
+ following patches to drop out:
+ - patches.arch/i386-compat-vdso
+ - patches.drivers/ati-sb700-sata-add-all-ids.patch
+ - patches.fixes/suspend_check_for_invalid_mem.patch
+* Wed Aug 22 2007 - sdietrich@suse.de
+- update RT config files: disable CONFIG_SYSFS_DEPRECATED
+* Wed Aug 22 2007 - olh@suse.de
+- enable MODULE_DEVICE_TABLE in snd-mpc52xx-ac97
+* Wed Aug 22 2007 - olh@suse.de
+- reduce ps3fb memsize from 18MB to 9MB
+* Wed Aug 22 2007 - jbeulich@novell.com
+- Also resync Xen configs.
+* Tue Aug 21 2007 - olh@suse.de
+- build ps3 sys-manager into the kernel to allow reboot in all cases
+* Tue Aug 21 2007 - tiwai@suse.de
+- Update config files: disable CONFIG_SND_*_FIRMWARE_IN_KERNEL
+ since we have already firmware files on 10.3.
+* Tue Aug 21 2007 - teheo@suse.de
+- patches.drivers/pci-rx790-disable-msi: PCI: disable MSI on RX790
+ (302016).
+* Tue Aug 21 2007 - gregkh@suse.de
+- Fix up -rt patches to apply with the change to 2.6.22.4, ripping out
+ the -rt Makefile changes so this doesn't happen again...
+* Tue Aug 21 2007 - gregkh@suse.de
+- Update to 2.6.22.4
+ - fixes CVE-2007-3848
* Mon Aug 20 2007 - bwalle@suse.de
- rpm/post.sh: Execute update-bootloader script also during update
(#300930)
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-08-20 18:50:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-08-24 09:01:22.000000000 +0200
@@ -1 +1 @@
-2007/08/20 16:50:09 UTC
+2007/08/23 12:56:03 UTC
++++++ config.tar.bz2 ++++++
++++ 3932 lines of diff (skipped)
++++++ kabi.tar.bz2 ++++++
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2007-08-20 19:04:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-08-24 09:01:35.000000000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/i386-compat-vdso new/patches.arch/i386-compat-vdso
--- old/patches.arch/i386-compat-vdso 2007-08-15 15:16:43.000000000 +0200
+++ new/patches.arch/i386-compat-vdso 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-Subject: i386: allow debuggers to access the vsyscall page with compat vDSO
-From: "Jan Beulich"
-Signed-off-by: Jan Beulich
-Signed-off-by: Andi Kleen
-
- arch/i386/kernel/sysenter.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: linux/arch/i386/kernel/sysenter.c
-===================================================================
---- linux.orig/arch/i386/kernel/sysenter.c
-+++ linux/arch/i386/kernel/sysenter.c
-@@ -336,7 +336,9 @@ struct vm_area_struct *get_gate_vma(stru
-
- int in_gate_area(struct task_struct *task, unsigned long addr)
- {
-- return 0;
-+ const struct vm_area_struct *vma = get_gate_vma(task);
-+
-+ return vma && addr >= vma->vm_start && addr < vma->vm_end;
- }
-
- int in_gate_area_no_task(unsigned long addr)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-efika-mpc52xx-ac97.patch new/patches.arch/ppc-efika-mpc52xx-ac97.patch
--- old/patches.arch/ppc-efika-mpc52xx-ac97.patch 2007-06-18 13:16:37.000000000 +0200
+++ new/patches.arch/ppc-efika-mpc52xx-ac97.patch 2007-08-24 08:59:26.000000000 +0200
@@ -750,8 +750,8 @@
+ .compatible = "mpc5200b-psc-ac97", /* B only for now */
+ },
+};
-+/* Prevent autoload during developpment phase ... */
-+/* MODULE_DEVICE_TABLE(of, mpc52xx_ac97_of_match); */
++
++MODULE_DEVICE_TABLE(of, mpc52xx_ac97_of_match);
+
+
+static struct of_platform_driver mpc52xx_ac97_of_driver = {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3-video-synmaster.patch new/patches.arch/ppc-ps3-video-synmaster.patch
--- old/patches.arch/ppc-ps3-video-synmaster.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/ppc-ps3-video-synmaster.patch 2007-08-23 09:53:29.000000000 +0200
@@ -0,0 +1,12 @@
+--- ./drivers/ps3/ps3av.c 2007-08-23 08:37:15.000000000 +0200
++++ linux-2.6.22/drivers/ps3/ps3av.c 2007-08-23 09:37:24.731763642 +0200
+@@ -713,6 +713,9 @@ static const struct ps3av_monitor_quirk
+ .monitor_name = "L226WTQ",
+ .clear_60 = PS3AV_RESBIT_1920x1080I |
+ PS3AV_RESBIT_1920x1080P
++ }, {
++ .monitor_name = "SyncMaster",
++ .clear_60 = PS3AV_RESBIT_1920x1080I
+ }
+ };
+
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ati-sb700-sata-add-all-ids.patch new/patches.drivers/ati-sb700-sata-add-all-ids.patch
--- old/patches.drivers/ati-sb700-sata-add-all-ids.patch 2007-07-17 17:52:07.000000000 +0200
+++ new/patches.drivers/ati-sb700-sata-add-all-ids.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-Subject: [patch] Add more device IDs for supporting ATI SB700 SATA controller completely
-From: Henry Su
-Patch-Mainline: 2.6.23
-References: 291744
-
-openSUSE10.3/10.2 etc may NOT be installed on ATI SB700 when set "onchip SATA
-type" in BIOS into "AHCI" mode. There are four SATA related device IDs in
-SB700:
-
-0x4390, SATA in IDE mode
-0x4391, SATA in AHCI mode
-0x4392, SATA in RAID mode with Promise non-Raid5 driver
-0x4393, SATA in RAID mode with Promise Raid5 driver
-
-This is different from SB600, there is only one SATA Device ID in SB600, which
-is 0x4380.
-
-Signed-off-by: Brandon Philips
----
- drivers/ata/ahci.c | 5 ++++-
- 1 files changed, 4 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.22/drivers/ata/ahci.c
-===================================================================
---- linux-2.6.22.orig/drivers/ata/ahci.c
-+++ linux-2.6.22/drivers/ata/ahci.c
-@@ -399,7 +399,10 @@ static const struct pci_device_id ahci_p
-
- /* ATI */
- { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
-- { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */
-+ { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */
-+ { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */
-+ { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nor-raid5 */
-+ { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 */
-
- /* VIA */
- { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/pci-rx790-disable-msi new/patches.drivers/pci-rx790-disable-msi
--- old/patches.drivers/pci-rx790-disable-msi 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/pci-rx790-disable-msi 2007-08-21 07:27:24.000000000 +0200
@@ -0,0 +1,36 @@
+From: Tejun Heo
+Subject: [PATCH] PCI: disable MSI on RX790
+References: 302016
+
+RX790 can't do MSI like its predecessors. Disable MSI on RX790.
+
+Signed-off-by: Tejun Heo
+---
+ drivers/pci/quirks.c | 1 +
+ include/linux/pci_ids.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+Index: linux-2.6.22/drivers/pci/quirks.c
+===================================================================
+--- linux-2.6.22.orig/drivers/pci/quirks.c
++++ linux-2.6.22/drivers/pci/quirks.c
+@@ -1641,6 +1641,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SE
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS400_200, quirk_disable_all_msi);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS480, quirk_disable_all_msi);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RD580, quirk_disable_all_msi);
++DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RX790, quirk_disable_all_msi);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RS690, quirk_disable_all_msi);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VT3351, quirk_disable_all_msi);
+
+Index: linux-2.6.22/include/linux/pci_ids.h
+===================================================================
+--- linux-2.6.22.orig/include/linux/pci_ids.h
++++ linux-2.6.22/include/linux/pci_ids.h
+@@ -358,6 +358,7 @@
+ #define PCI_DEVICE_ID_ATI_RS400_200 0x5a33
+ #define PCI_DEVICE_ID_ATI_RS480 0x5950
+ #define PCI_DEVICE_ID_ATI_RD580 0x5952
++#define PCI_DEVICE_ID_ATI_RX790 0x5957
+ #define PCI_DEVICE_ID_ATI_RS690 0x7910
+ /* ATI IXP Chipset */
+ #define PCI_DEVICE_ID_ATI_IXP200_IDE 0x4349
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/suspend_check_for_invalid_mem.patch new/patches.fixes/suspend_check_for_invalid_mem.patch
--- old/patches.fixes/suspend_check_for_invalid_mem.patch 2007-08-05 15:30:31.000000000 +0200
+++ new/patches.fixes/suspend_check_for_invalid_mem.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-From: Rafael Wysocki
-Subject: Check for invalid memory on resume and suspend
-Patch-mainline: soon
-References: #296242
-
-Signed-off-by: Thomas Renninger
-Acked-by: Pavel Machek
-Ackde-by: Andi Kleen
-
----
- kernel/power/snapshot.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: linux-2.6/kernel/power/snapshot.c
-===================================================================
---- linux-2.6.orig/kernel/power/snapshot.c
-+++ linux-2.6/kernel/power/snapshot.c
-@@ -709,7 +709,8 @@ static void mark_nosave_pages(struct mem
- region->end_pfn << PAGE_SHIFT);
-
- for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
-- memory_bm_set_bit(bm, pfn);
-+ if (pfn_valid(pfn))
-+ memory_bm_set_bit(bm, pfn);
- }
- }
-
++++++ patches.kernel.org.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.22.3-4 new/patches.kernel.org/patch-2.6.22.3-4
--- old/patches.kernel.org/patch-2.6.22.3-4 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.kernel.org/patch-2.6.22.3-4 2007-08-21 07:03:17.000000000 +0200
@@ -0,0 +1,50 @@
+Subject: Linux 2.6.22.4
+From: Greg Kroah-Hartman
+
+Signed-off-by: Greg Kroah-Hartman
+
+diff --git a/Makefile b/Makefile
+index bc2d377..f2a62ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .3
++EXTRAVERSION = .4
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*
+diff --git a/fs/exec.c b/fs/exec.c
+index f20561f..9a93770 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -890,9 +890,12 @@ int flush_old_exec(struct linux_binprm * bprm)
+ */
+ current->mm->task_size = TASK_SIZE;
+
+- if (bprm->e_uid != current->euid || bprm->e_gid != current->egid ||
+- file_permission(bprm->file, MAY_READ) ||
+- (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) {
++ if (bprm->e_uid != current->euid || bprm->e_gid != current->egid) {
++ suid_keys(current);
++ current->mm->dumpable = suid_dumpable;
++ current->pdeath_signal = 0;
++ } else if (file_permission(bprm->file, MAY_READ) ||
++ (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)) {
+ suid_keys(current);
+ current->mm->dumpable = suid_dumpable;
+ }
+@@ -983,8 +986,10 @@ void compute_creds(struct linux_binprm *bprm)
+ {
+ int unsafe;
+
+- if (bprm->e_uid != current->uid)
++ if (bprm->e_uid != current->uid) {
+ suid_keys(current);
++ current->pdeath_signal = 0;
++ }
+ exec_keys(current);
+
+ task_lock(current);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.kernel.org/patch-2.6.22.4-5 new/patches.kernel.org/patch-2.6.22.4-5
--- old/patches.kernel.org/patch-2.6.22.4-5 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.kernel.org/patch-2.6.22.4-5 2007-08-23 02:31:53.000000000 +0200
@@ -0,0 +1,760 @@
+Subject: Linux 2.6.22.5
+From: Greg Kroah-Hartman
+
+Signed-off-by: Greg Kroah-Hartman
+
+diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
+index af50f9b..026e4e5 100644
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt
+@@ -850,11 +850,6 @@ and is between 256 and 4096 characters. It is defined in the file
+ lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip
+ Format: addr:<io>,irq:<irq>
+
+- legacy_serial.force [HW,IA-32,X86-64]
+- Probe for COM ports at legacy addresses even
+- if PNPBIOS or ACPI should describe them. This
+- is for working around firmware defects.
+-
+ llsc*= [IA64] See function print_params() in
+ arch/ia64/sn/kernel/llsc4.c.
+
+diff --git a/Makefile b/Makefile
+index f2a62ee..5d2a660 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .4
++EXTRAVERSION = .5
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*
+diff --git a/arch/i386/Makefile b/arch/i386/Makefile
+index bd28f9f..541b3ae 100644
+--- a/arch/i386/Makefile
++++ b/arch/i386/Makefile
+@@ -51,8 +51,8 @@ cflags-y += -maccumulate-outgoing-args
+ CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-option,-fno-unit-at-a-time); fi ;)
+
+ # do binutils support CFI?
+-cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+-AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
++cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
++AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset esp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+
+ # is .cfi_signal_frame supported too?
+ cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
+diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
+index 06da59f..e9297cb 100644
+--- a/arch/i386/kernel/Makefile
++++ b/arch/i386/kernel/Makefile
+@@ -35,7 +35,6 @@ obj-y += sysenter.o vsyscall.o
+ obj-$(CONFIG_ACPI_SRAT) += srat.o
+ obj-$(CONFIG_EFI) += efi.o efi_stub.o
+ obj-$(CONFIG_DOUBLEFAULT) += doublefault.o
+-obj-$(CONFIG_SERIAL_8250) += legacy_serial.o
+ obj-$(CONFIG_VM86) += vm86.o
+ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+ obj-$(CONFIG_HPET_TIMER) += hpet.o
+diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
+index 4d26d51..996f6f8 100644
+--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
++++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
+@@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nmi_hz)
+ perfctr_msr = MSR_P6_PERFCTR0;
+ evntsel_msr = MSR_P6_EVNTSEL0;
+
+- wrmsrl(perfctr_msr, 0UL);
++ /* KVM doesn't implement this MSR */
++ if (wrmsr_safe(perfctr_msr, 0, 0) < 0)
++ return 0;
+
+ evntsel = P6_EVNTSEL_INT
+ | P6_EVNTSEL_OS
+diff --git a/arch/i386/kernel/doublefault.c b/arch/i386/kernel/doublefault.c
+index 265c559..40978af 100644
+--- a/arch/i386/kernel/doublefault.c
++++ b/arch/i386/kernel/doublefault.c
+@@ -13,7 +13,7 @@
+ static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
+ #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
+
+-#define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + 0x1000000)
++#define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
+
+ static void doublefault_fn(void)
+ {
+@@ -23,23 +23,23 @@ static void doublefault_fn(void)
+ store_gdt(&gdt_desc);
+ gdt = gdt_desc.address;
+
+- printk("double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
++ printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
+
+ if (ptr_ok(gdt)) {
+ gdt += GDT_ENTRY_TSS << 3;
+ tss = *(u16 *)(gdt+2);
+ tss += *(u8 *)(gdt+4) << 16;
+ tss += *(u8 *)(gdt+7) << 24;
+- printk("double fault, tss at %08lx\n", tss);
++ printk(KERN_EMERG "double fault, tss at %08lx\n", tss);
+
+ if (ptr_ok(tss)) {
+ struct i386_hw_tss *t = (struct i386_hw_tss *)tss;
+
+- printk("eip = %08lx, esp = %08lx\n", t->eip, t->esp);
++ printk(KERN_EMERG "eip = %08lx, esp = %08lx\n", t->eip, t->esp);
+
+- printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
++ printk(KERN_EMERG "eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ t->eax, t->ebx, t->ecx, t->edx);
+- printk("esi = %08lx, edi = %08lx\n",
++ printk(KERN_EMERG "esi = %08lx, edi = %08lx\n",
+ t->esi, t->edi);
+ }
+ }
+@@ -63,6 +63,7 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
+ .cs = __KERNEL_CS,
+ .ss = __KERNEL_DS,
+ .ds = __USER_DS,
++ .fs = __KERNEL_PERCPU,
+
+ .__cr3 = __pa(swapper_pg_dir)
+ }
+diff --git a/arch/i386/kernel/legacy_serial.c b/arch/i386/kernel/legacy_serial.c
+deleted file mode 100644
+index 2151011..0000000
+--- a/arch/i386/kernel/legacy_serial.c
++++ /dev/null
+@@ -1,67 +0,0 @@
+-/*
+- * Legacy COM port devices for x86 platforms without PNPBIOS or ACPI.
+- * Data taken from include/asm-i386/serial.h.
+- *
+- * (c) Copyright 2007 Hewlett-Packard Development Company, L.P.
+- * Bjorn Helgaas
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License version 2 as
+- * published by the Free Software Foundation.
+- */
+-#include
+-#include
+-#include
+-#include
+-
+-/* Standard COM flags (except for COM4, because of the 8514 problem) */
+-#ifdef CONFIG_SERIAL_DETECT_IRQ
+-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_AUTO_IRQ)
+-#define COM4_FLAGS (UPF_BOOT_AUTOCONF | UPF_AUTO_IRQ)
+-#else
+-#define COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST)
+-#define COM4_FLAGS UPF_BOOT_AUTOCONF
+-#endif
+-
+-#define PORT(_base,_irq,_flags) \
+- { \
+- .iobase = _base, \
+- .irq = _irq, \
+- .uartclk = 1843200, \
+- .iotype = UPIO_PORT, \
+- .flags = _flags, \
+- }
+-
+-static struct plat_serial8250_port x86_com_data[] = {
+- PORT(0x3F8, 4, COM_FLAGS),
+- PORT(0x2F8, 3, COM_FLAGS),
+- PORT(0x3E8, 4, COM_FLAGS),
+- PORT(0x2E8, 3, COM4_FLAGS),
+- { },
+-};
+-
+-static struct platform_device x86_com_device = {
+- .name = "serial8250",
+- .id = PLAT8250_DEV_PLATFORM,
+- .dev = {
+- .platform_data = x86_com_data,
+- },
+-};
+-
+-static int force_legacy_probe;
+-module_param_named(force, force_legacy_probe, bool, 0);
+-MODULE_PARM_DESC(force, "Force legacy serial port probe");
+-
+-static int __init serial8250_x86_com_init(void)
+-{
+- if (pnp_platform_devices && !force_legacy_probe)
+- return -ENODEV;
+-
+- return platform_device_register(&x86_com_device);
+-}
+-
+-module_init(serial8250_x86_com_init);
+-
+-MODULE_AUTHOR("Bjorn Helgaas");
+-MODULE_LICENSE("GPL");
+-MODULE_DESCRIPTION("Generic 8250/16x50 legacy probe module");
+diff --git a/arch/i386/kernel/sysenter.c b/arch/i386/kernel/sysenter.c
+index ff4ee6f..6deb159 100644
+--- a/arch/i386/kernel/sysenter.c
++++ b/arch/i386/kernel/sysenter.c
+@@ -336,7 +336,9 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
+
+ int in_gate_area(struct task_struct *task, unsigned long addr)
+ {
+- return 0;
++ const struct vm_area_struct *vma = get_gate_vma(task);
++
++ return vma && addr >= vma->vm_start && addr < vma->vm_end;
+ }
+
+ int in_gate_area_no_task(unsigned long addr)
+diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
+index 29617ae..fdab077 100644
+--- a/arch/x86_64/Makefile
++++ b/arch/x86_64/Makefile
+@@ -57,8 +57,8 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
+ cflags-y += -maccumulate-outgoing-args
+
+ # do binutils support CFI?
+-cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+-AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
++cflags-y += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
++AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_rel_offset rsp${comma}0\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+
+ # is .cfi_signal_frame supported too?
+ cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
+diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
+index de1de8a..4d94c51 100644
+--- a/arch/x86_64/kernel/Makefile
++++ b/arch/x86_64/kernel/Makefile
+@@ -32,7 +32,6 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
+ obj-$(CONFIG_IOMMU) += pci-gart.o aperture.o
+ obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary.o tce.o
+ obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
+-obj-$(CONFIG_SERIAL_8250) += legacy_serial.o
+ obj-$(CONFIG_KPROBES) += kprobes.o
+ obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o
+ obj-$(CONFIG_X86_VSMP) += vsmp.o
+@@ -50,7 +49,6 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0
+
+ therm_throt-y += ../../i386/kernel/cpu/mcheck/therm_throt.o
+ bootflag-y += ../../i386/kernel/bootflag.o
+-legacy_serial-y += ../../i386/kernel/legacy_serial.o
+ cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
+ topology-y += ../../i386/kernel/topology.o
+ microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
+diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S
+index 1fab487..c63fc64 100644
+--- a/arch/x86_64/kernel/head.S
++++ b/arch/x86_64/kernel/head.S
+@@ -326,8 +326,7 @@ NEXT_PAGE(level2_kernel_pgt)
+ /* 40MB kernel mapping. The kernel code cannot be bigger than that.
+ When you change this change KERNEL_TEXT_SIZE in page.h too. */
+ /* (2^48-(2*1024*1024*1024)-((2^39)*511)-((2^30)*510)) = 0 */
+- PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL,
+- KERNEL_TEXT_SIZE/PMD_SIZE)
++ PMDS(0x0000000000000000, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, KERNEL_TEXT_SIZE/PMD_SIZE)
+ /* Module mapping starts here */
+ .fill (PTRS_PER_PMD - (KERNEL_TEXT_SIZE/PMD_SIZE)),8,0
+
+diff --git a/drivers/acpi/events/evgpeblk.c b/drivers/acpi/events/evgpeblk.c
+index 902c287..361ebe6 100644
+--- a/drivers/acpi/events/evgpeblk.c
++++ b/drivers/acpi/events/evgpeblk.c
+@@ -586,6 +586,10 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
+ flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);
+ if (gpe_xrupt->previous) {
+ gpe_xrupt->previous->next = gpe_xrupt->next;
++ } else {
++ /* No previous, update list head */
++
++ acpi_gbl_gpe_xrupt_list_head = gpe_xrupt->next;
+ }
+
+ if (gpe_xrupt->next) {
+diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
+index 1285e91..002bb33 100644
+--- a/drivers/acpi/tables/tbfadt.c
++++ b/drivers/acpi/tables/tbfadt.c
+@@ -211,14 +211,17 @@ void acpi_tb_parse_fadt(acpi_native_uint table_index, u8 flags)
+ * DESCRIPTION: Get a local copy of the FADT and convert it to a common format.
+ * Performs validation on some important FADT fields.
+ *
++ * NOTE: We create a local copy of the FADT regardless of the version.
++ *
+ ******************************************************************************/
+
+ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
+ {
+
+ /*
+- * Check if the FADT is larger than what we know about (ACPI 2.0 version).
+- * Truncate the table, but make some noise.
++ * Check if the FADT is larger than the largest table that we expect
++ * (the ACPI 2.0/3.0 version). If so, truncate the table, and issue
++ * a warning.
+ */
+ if (length > sizeof(struct acpi_table_fadt)) {
+ ACPI_WARNING((AE_INFO,
+@@ -227,10 +230,12 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
+ sizeof(struct acpi_table_fadt)));
+ }
+
+- /* Copy the entire FADT locally. Zero first for tb_convert_fadt */
++ /* Clear the entire local FADT */
+
+ ACPI_MEMSET(&acpi_gbl_FADT, 0, sizeof(struct acpi_table_fadt));
+
++ /* Copy the original FADT, up to sizeof (struct acpi_table_fadt) */
++
+ ACPI_MEMCPY(&acpi_gbl_FADT, table,
+ ACPI_MIN(length, sizeof(struct acpi_table_fadt)));
+
+@@ -251,7 +256,7 @@ void acpi_tb_create_local_fadt(struct acpi_table_header *table, u32 length)
+ * RETURN: None
+ *
+ * DESCRIPTION: Converts all versions of the FADT to a common internal format.
+- * -> Expand all 32-bit addresses to 64-bit.
++ * Expand all 32-bit addresses to 64-bit.
+ *
+ * NOTE: acpi_gbl_FADT must be of size (struct acpi_table_fadt),
+ * and must contain a copy of the actual FADT.
+@@ -292,8 +297,23 @@ static void acpi_tb_convert_fadt(void)
+ }
+
+ /*
+- * Expand the 32-bit V1.0 addresses to the 64-bit "X" generic address
+- * structures as necessary.
++ * For ACPI 1.0 FADTs (revision 1 or 2), ensure that reserved fields which
++ * should be zero are indeed zero. This will workaround BIOSs that
++ * inadvertently place values in these fields.
++ *
++ * The ACPI 1.0 reserved fields that will be zeroed are the bytes located at
++ * offset 45, 55, 95, and the word located at offset 109, 110.
++ */
++ if (acpi_gbl_FADT.header.revision < 3) {
++ acpi_gbl_FADT.preferred_profile = 0;
++ acpi_gbl_FADT.pstate_control = 0;
++ acpi_gbl_FADT.cst_control = 0;
++ acpi_gbl_FADT.boot_flags = 0;
++ }
++
++ /*
++ * Expand the ACPI 1.0 32-bit V1.0 addresses to the ACPI 2.0 64-bit "X"
++ * generic address structures as necessary.
+ */
+ for (i = 0; i < ACPI_FADT_INFO_ENTRIES; i++) {
+ target =
+@@ -349,18 +369,6 @@ static void acpi_tb_convert_fadt(void)
+ acpi_gbl_FADT.xpm1a_event_block.space_id;
+
+ }
+-
+- /*
+- * For ACPI 1.0 FADTs, ensure that reserved fields (which should be zero)
+- * are indeed zero. This will workaround BIOSs that inadvertently placed
+- * values in these fields.
+- */
+- if (acpi_gbl_FADT.header.revision < 3) {
+- acpi_gbl_FADT.preferred_profile = 0;
+- acpi_gbl_FADT.pstate_control = 0;
+- acpi_gbl_FADT.cst_control = 0;
+- acpi_gbl_FADT.boot_flags = 0;
+- }
+ }
+
+ /******************************************************************************
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index ca5229d..3400b3e 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -399,7 +399,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
+
+ /* ATI */
+ { PCI_VDEVICE(ATI, 0x4380), board_ahci_sb600 }, /* ATI SB600 */
+- { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 */
++ { PCI_VDEVICE(ATI, 0x4390), board_ahci_sb600 }, /* ATI SB700 IDE */
++ { PCI_VDEVICE(ATI, 0x4391), board_ahci_sb600 }, /* ATI SB700 AHCI */
++ { PCI_VDEVICE(ATI, 0x4392), board_ahci_sb600 }, /* ATI SB700 nraid5 */
++ { PCI_VDEVICE(ATI, 0x4393), board_ahci_sb600 }, /* ATI SB700 raid5 */
+
+ /* VIA */
+ { PCI_VDEVICE(VIA, 0x3349), board_ahci_vt8251 }, /* VIA VT8251 */
+diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
+index 1e21c8c..c3e716e 100644
+--- a/drivers/hwmon/smsc47m1.c
++++ b/drivers/hwmon/smsc47m1.c
+@@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
+
+ if ((err = device_create_file(dev, &dev_attr_alarms)))
+ goto error_remove_files;
++ if ((err = device_create_file(dev, &dev_attr_name)))
++ goto error_remove_files;
+
+ data->class_dev = hwmon_device_register(dev);
+ if (IS_ERR(data->class_dev)) {
+diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
+index f85b48f..c95909c 100644
+--- a/drivers/hwmon/w83781d.c
++++ b/drivers/hwmon/w83781d.c
+@@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da,
+ static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR,
+ show_sensor, store_sensor, 0);
+ static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,
+- show_sensor, store_sensor, 0);
++ show_sensor, store_sensor, 1);
+ static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,
+- show_sensor, store_sensor, 0);
++ show_sensor, store_sensor, 2);
+
+ /* I2C devices get this name attribute automatically, but for ISA devices
+ we must create it by ourselves. */
+diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
+index a361dba..4a7b5f4 100644
+--- a/drivers/net/forcedeth.c
++++ b/drivers/net/forcedeth.c
+@@ -3067,8 +3067,8 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
+ np->nic_poll_irq = np->irqmask;
+ mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+ }
+- printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
+ spin_unlock(&np->lock);
++ printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
+ break;
+ }
+
+@@ -3185,8 +3185,8 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
+ np->nic_poll_irq = np->irqmask;
+ mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+ }
+- printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
+ spin_unlock(&np->lock);
++ printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq.\n", dev->name, i);
+ break;
+ }
+
+@@ -3232,8 +3232,8 @@ static irqreturn_t nv_nic_irq_tx(int foo, void *data)
+ np->nic_poll_irq |= NVREG_IRQ_TX_ALL;
+ mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+ }
+- printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n", dev->name, i);
+ spin_unlock_irqrestore(&np->lock, flags);
++ printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_tx.\n", dev->name, i);
+ break;
+ }
+
+@@ -3347,8 +3347,8 @@ static irqreturn_t nv_nic_irq_rx(int foo, void *data)
+ np->nic_poll_irq |= NVREG_IRQ_RX_ALL;
+ mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+ }
+- printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n", dev->name, i);
+ spin_unlock_irqrestore(&np->lock, flags);
++ printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_rx.\n", dev->name, i);
+ break;
+ }
+ }
+@@ -3420,8 +3420,8 @@ static irqreturn_t nv_nic_irq_other(int foo, void *data)
+ np->nic_poll_irq |= NVREG_IRQ_OTHER;
+ mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
+ }
+- printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n", dev->name, i);
+ spin_unlock_irqrestore(&np->lock, flags);
++ printk(KERN_DEBUG "%s: too many iterations (%d) in nv_nic_irq_other.\n", dev->name, i);
+ break;
+ }
+
+diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
+index 5ec7752..84958c8 100644
+--- a/drivers/net/r8169.c
++++ b/drivers/net/r8169.c
+@@ -2649,14 +2649,16 @@ rtl8169_interrupt(int irq, void *dev_instance)
+ rtl8169_check_link_status(dev, tp, ioaddr);
+
+ #ifdef CONFIG_R8169_NAPI
+- RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event);
+- tp->intr_mask = ~rtl8169_napi_event;
+-
+- if (likely(netif_rx_schedule_prep(dev)))
+- __netif_rx_schedule(dev);
+- else if (netif_msg_intr(tp)) {
+- printk(KERN_INFO "%s: interrupt %04x taken in poll\n",
+- dev->name, status);
++ if (status & rtl8169_napi_event) {
++ RTL_W16(IntrMask, rtl8169_intr_mask & ~rtl8169_napi_event);
++ tp->intr_mask = ~rtl8169_napi_event;
++
++ if (likely(netif_rx_schedule_prep(dev)))
++ __netif_rx_schedule(dev);
++ else if (netif_msg_intr(tp)) {
++ printk(KERN_INFO "%s: interrupt %04x in poll\n",
++ dev->name, status);
++ }
+ }
+ break;
+ #else
+diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
+index fe01b96..d2646a8 100644
+--- a/drivers/net/sky2.c
++++ b/drivers/net/sky2.c
+@@ -96,7 +96,7 @@ 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 = 0;
++static int idle_timeout = 100;
+ module_param(idle_timeout, int, 0);
+ MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
+
+@@ -1234,6 +1234,8 @@ static int sky2_up(struct net_device *dev)
+ if (netif_msg_ifup(sky2))
+ printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
+
++ netif_carrier_off(dev);
++
+ /* must be power of 2 */
+ sky2->tx_le = pci_alloc_consistent(hw->pdev,
+ TX_RING_SIZE *
+@@ -1573,7 +1575,6 @@ static int sky2_down(struct net_device *dev)
+
+ /* Stop more packets from being queued */
+ netif_stop_queue(dev);
+- netif_carrier_off(dev);
+
+ /* Disable port IRQ */
+ imask = sky2_read32(hw, B0_IMSK);
+@@ -1625,6 +1626,8 @@ static int sky2_down(struct net_device *dev)
+
+ sky2_phy_power(hw, port, 0);
+
++ netif_carrier_off(dev);
++
+ /* turn off LED's */
+ sky2_write16(hw, B0_Y2LED, LED_STAT_OFF);
+
+@@ -1689,7 +1692,6 @@ static void sky2_link_up(struct sky2_port *sky2)
+ gm_phy_write(hw, port, PHY_MARV_INT_MASK, PHY_M_DEF_MSK);
+
+ netif_carrier_on(sky2->netdev);
+- netif_wake_queue(sky2->netdev);
+
+ /* Turn on link LED */
+ sky2_write8(hw, SK_REG(port, LNK_LED_REG),
+@@ -1741,7 +1743,6 @@ static void sky2_link_down(struct sky2_port *sky2)
+ gma_write16(hw, port, GM_GP_CTRL, reg);
+
+ netif_carrier_off(sky2->netdev);
+- netif_stop_queue(sky2->netdev);
+
+ /* Turn on link LED */
+ sky2_write8(hw, SK_REG(port, LNK_LED_REG), LINKLED_OFF);
+@@ -2064,6 +2065,9 @@ static struct sk_buff *sky2_receive(struct net_device *dev,
+ if (!(status & GMR_FS_RX_OK))
+ goto resubmit;
+
++ if (status >> 16 != length)
++ goto len_mismatch;
++
+ if (length < copybreak)
+ skb = receive_copy(sky2, re, length);
+ else
+@@ -2073,6 +2077,11 @@ resubmit:
+
+ return skb;
+
++len_mismatch:
++ /* Truncation of overlength packets
++ causes PHY length to not match MAC length */
++ ++sky2->net_stats.rx_length_errors;
++
+ error:
+ ++sky2->net_stats.rx_errors;
+ if (status & GMR_FS_RX_FF_OV) {
+@@ -2427,8 +2436,7 @@ static void sky2_err_intr(struct sky2_hw *hw, u32 status)
+ static int sky2_poll(struct net_device *dev0, int *budget)
+ {
+ struct sky2_hw *hw = ((struct sky2_port *) netdev_priv(dev0))->hw;
+- int work_limit = min(dev0->quota, *budget);
+- int work_done = 0;
++ int work_done;
+ u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
+
+ if (unlikely(status & Y2_IS_ERROR))
+@@ -2440,18 +2448,25 @@ static int sky2_poll(struct net_device *dev0, int *budget)
+ if (status & Y2_IS_IRQ_PHY2)
+ sky2_phy_intr(hw, 1);
+
+- work_done = sky2_status_intr(hw, work_limit);
+- if (work_done < work_limit) {
+- netif_rx_complete(dev0);
++ work_done = sky2_status_intr(hw, min(dev0->quota, *budget));
++ *budget -= work_done;
++ dev0->quota -= work_done;
+
+- /* end of interrupt, re-enables also acts as I/O synchronization */
+- sky2_read32(hw, B0_Y2_SP_LISR);
+- return 0;
+- } else {
+- *budget -= work_done;
+- dev0->quota -= work_done;
++ /* More work? */
++ if (hw->st_idx != sky2_read16(hw, STAT_PUT_IDX))
+ return 1;
++
++ /* Bug/Errata workaround?
++ * Need to kick the TX irq moderation timer.
++ */
++ if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) {
++ sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
++ sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
+ }
++ netif_rx_complete(dev0);
++
++ sky2_read32(hw, B0_Y2_SP_LISR);
++ return 0;
+ }
+
+ static irqreturn_t sky2_intr(int irq, void *dev_id)
+@@ -3486,10 +3501,6 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
+ memcpy_fromio(dev->dev_addr, hw->regs + B2_MAC_1 + port * 8, ETH_ALEN);
+ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
+- /* device is off until link detection */
+- netif_carrier_off(dev);
+- netif_stop_queue(dev);
+-
+ return dev;
+ }
+
+diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
+index 315ea99..a288de5 100644
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
+@@ -74,21 +74,17 @@ config SERIAL_8250_PCI
+ depends on SERIAL_8250 && PCI
+ default SERIAL_8250
+ help
+- Say Y here if you have PCI serial ports.
+-
+- To compile this driver as a module, choose M here: the module
+- will be called 8250_pci.
++ This builds standard PCI serial support. You may be able to
++ disable this feature if you only need legacy serial support.
++ Saves about 9K.
+
+ config SERIAL_8250_PNP
+ tristate "8250/16550 PNP device support" if EMBEDDED
+ depends on SERIAL_8250 && PNP
+ default SERIAL_8250
+ help
+- Say Y here if you have serial ports described by PNPBIOS or ACPI.
+- These are typically ports built into the system board.
+-
+- To compile this driver as a module, choose M here: the module
+- will be called 8250_pnp.
++ This builds standard PNP serial support. You may be able to
++ disable this feature if you only need legacy serial support.
+
+ config SERIAL_8250_HP300
+ tristate
+diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c
+index c9fe0ab..1b68a52 100644
+--- a/fs/jffs2/write.c
++++ b/fs/jffs2/write.c
+@@ -553,6 +553,9 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f,
+ struct jffs2_full_dirent **prev = &dir_f->dents;
+ uint32_t nhash = full_name_hash(name, namelen);
+
++ /* We don't actually want to reserve any space, but we do
++ want to be holding the alloc_sem when we write to flash */
++ down(&c->alloc_sem);
+ down(&dir_f->sem);
+
+ while ((*prev) && (*prev)->nhash <= nhash) {
+diff --git a/include/asm-avr32/atomic.h b/include/asm-avr32/atomic.h
+index b9c2548..7ef3862 100644
+--- a/include/asm-avr32/atomic.h
++++ b/include/asm-avr32/atomic.h
+@@ -101,7 +101,7 @@ static inline int atomic_sub_unless(atomic_t *v, int a, int u)
+ " mov %1, 1\n"
+ "1:"
+ : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
+- : "m"(v->counter), "rKs21"(a), "rKs21"(u)
++ : "m"(v->counter), "rKs21"(a), "rKs21"(u), "1"(result)
+ : "cc", "memory");
+
+ return result;
+@@ -137,7 +137,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
+ " mov %1, 1\n"
+ "1:"
+ : "=&r"(tmp), "=&r"(result), "=o"(v->counter)
+- : "m"(v->counter), "r"(a), "ir"(u)
++ : "m"(v->counter), "r"(a), "ir"(u), "1"(result)
+ : "cc", "memory");
+ }
+
+diff --git a/include/asm-i386/serial.h b/include/asm-i386/serial.h
+index 57a4306..bd67480 100644
+--- a/include/asm-i386/serial.h
++++ b/include/asm-i386/serial.h
+@@ -11,3 +11,19 @@
+ * megabits/second; but this requires the faster clock.
+ */
+ #define BASE_BAUD ( 1843200 / 16 )
++
++/* Standard COM flags (except for COM4, because of the 8514 problem) */
++#ifdef CONFIG_SERIAL_DETECT_IRQ
++#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
++#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
++#else
++#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
++#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
++#endif
++
++#define SERIAL_PORT_DFNS \
++ /* UART CLK PORT IRQ FLAGS */ \
++ { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
++ { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
++ { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
++ { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
+diff --git a/include/asm-x86_64/serial.h b/include/asm-x86_64/serial.h
+index 8ebd765..b0496e0 100644
+--- a/include/asm-x86_64/serial.h
++++ b/include/asm-x86_64/serial.h
+@@ -11,3 +11,19 @@
+ * megabits/second; but this requires the faster clock.
+ */
+ #define BASE_BAUD ( 1843200 / 16 )
++
++/* Standard COM flags (except for COM4, because of the 8514 problem) */
++#ifdef CONFIG_SERIAL_DETECT_IRQ
++#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)
++#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)
++#else
++#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST)
++#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF
++#endif
++
++#define SERIAL_PORT_DFNS \
++ /* UART CLK PORT IRQ FLAGS */ \
++ { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \
++ { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \
++ { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \
++ { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */
+diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
+index a3b7854..a686590 100644
+--- a/kernel/power/snapshot.c
++++ b/kernel/power/snapshot.c
+@@ -709,7 +709,8 @@ static void mark_nosave_pages(struct memory_bitmap *bm)
+ region->end_pfn << PAGE_SHIFT);
+
+ for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
+- memory_bm_set_bit(bm, pfn);
++ if (pfn_valid(pfn))
++ memory_bm_set_bit(bm, pfn);
+ }
+ }
+
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/kdb-i386-compile-bugfixes new/patches.rt/kdb-i386-compile-bugfixes
--- old/patches.rt/kdb-i386-compile-bugfixes 2007-07-18 12:15:13.000000000 +0200
+++ new/patches.rt/kdb-i386-compile-bugfixes 2007-08-21 08:16:18.000000000 +0200
@@ -7,11 +7,15 @@
signed-off-by: Sven-Thorsten Dietrich
-Index: linux-2.6.22/kernel/sched.c
-===================================================================
---- linux-2.6.22.orig/kernel/sched.c 2007-07-13 16:41:24.000000000 -0400
-+++ linux-2.6.22/kernel/sched.c 2007-07-13 16:41:25.000000000 -0400
-@@ -7366,47 +7366,6 @@
+---
+ kdb/modules/kdbm_task.c | 4 +---
+ kdb/modules/kdbm_vm.c | 2 +-
+ kernel/sched.c | 43 -------------------------------------------
+ 3 files changed, 2 insertions(+), 47 deletions(-)
+
+--- linux-2.6.22.orig/kernel/sched.c
++++ linux-2.6.22/kernel/sched.c
+@@ -7235,47 +7235,6 @@ EXPORT_SYMBOL(preempt_enable_no_resched)
#include
@@ -59,7 +63,7 @@
/* This code must be in sched.c because struct rq is only defined in this
* source. To allow most of kdb to be modular, this code cannot call any kdb
* functions directly, any external functions that it needs must be passed in
-@@ -7432,8 +7391,6 @@
+@@ -7301,8 +7260,6 @@ kdb_runqueue(unsigned long cpu, kdb_prin
#endif
xxx_printf(" nr_running:%lu nr_switches:%llu\n",
rq->nr_running, rq->nr_switches);
@@ -68,11 +72,9 @@
}
EXPORT_SYMBOL(kdb_runqueue);
-Index: linux-2.6.22/kdb/modules/kdbm_task.c
-===================================================================
---- linux-2.6.22.orig/kdb/modules/kdbm_task.c 2007-07-13 16:40:12.000000000 -0400
-+++ linux-2.6.22/kdb/modules/kdbm_task.c 2007-07-13 16:41:25.000000000 -0400
-@@ -93,9 +93,7 @@
+--- linux-2.6.22.orig/kdb/modules/kdbm_task.c
++++ linux-2.6.22/kdb/modules/kdbm_task.c
+@@ -93,9 +93,7 @@ kdbm_task(int argc, const char **argv)
kdb_printf(" need_resched=%d ",
test_tsk_thread_flag(tp, TIF_NEED_RESCHED));
@@ -83,11 +85,9 @@
kdb_printf(" lock_depth=%d\n", tp->lock_depth);
kdb_printf(
-Index: linux-2.6.22/kdb/modules/kdbm_vm.c
-===================================================================
---- linux-2.6.22.orig/kdb/modules/kdbm_vm.c 2007-07-13 16:40:12.000000000 -0400
-+++ linux-2.6.22/kdb/modules/kdbm_vm.c 2007-07-13 16:41:25.000000000 -0400
-@@ -67,7 +67,7 @@
+--- linux-2.6.22.orig/kdb/modules/kdbm_vm.c
++++ linux-2.6.22/kdb/modules/kdbm_vm.c
+@@ -67,7 +67,7 @@ kdbm_print_vm(struct vm_area_struct *vp,
kdb_printf("vm_start = 0x%p vm_end = 0x%p\n", (void *) vp->vm_start,
(void *) vp->vm_end);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt4-5 new/patches.rt/patch-2.6.22.1-rt4-5
--- old/patches.rt/patch-2.6.22.1-rt4-5 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt4-5 2007-08-21 08:16:18.000000000 +0200
@@ -2,7 +2,6 @@
---
- Makefile | 2 +-
arch/i386/Makefile | 4 ++--
arch/i386/kernel/hpet.c | 1 -
arch/i386/kernel/process.c | 1 -
@@ -11,7 +10,7 @@
kernel/sched.c | 2 --
kernel/softirq.c | 2 --
mm/quicklist.c | 9 +++++----
- 9 files changed, 23 insertions(+), 29 deletions(-)
+ 8 files changed, 22 insertions(+), 28 deletions(-)
--- linux-2.6.22.orig/arch/i386/kernel/hpet.c
+++ linux-2.6.22/arch/i386/kernel/hpet.c
@@ -153,17 +152,6 @@
/*
* Wake up the softirq task:
*/
---- linux-2.6.22.orig/Makefile
-+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3-rc4
-+EXTRAVERSION = .3-rc5
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
--- linux-2.6.22.orig/mm/quicklist.c
+++ linux-2.6.22/mm/quicklist.c
@@ -19,7 +19,7 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt4.openSUSE new/patches.rt/patch-2.6.22.1-rt4.openSUSE
--- old/patches.rt/patch-2.6.22.1-rt4.openSUSE 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt4.openSUSE 2007-08-21 08:16:18.000000000 +0200
@@ -11,7 +11,7 @@
Documentation/kernel-parameters.txt | 43
Documentation/sched-design-CFS.txt | 119
Documentation/stable_api_nonsense.txt | 3
- Makefile | 12
+ Makefile | 10
arch/arm/Kconfig | 17
arch/arm/boot/compressed/head.S | 12
arch/arm/common/time-acorn.c | 2
@@ -703,7 +703,7 @@
security/selinux/selinuxfs.c | 11
sound/core/control_compat.c | 2
sound/core/pcm_lib.c | 1
- 702 files changed, 27759 insertions(+), 9548 deletions(-)
+ 702 files changed, 27758 insertions(+), 9547 deletions(-)
--- /dev/null
+++ linux-2.6.22/Documentation/cpuidle/core.txt
@@ -1014,15 +1014,6 @@
- Linux runs on a wide range of different processor architectures.
--- linux-2.6.22.orig/Makefile
+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3
-+EXTRAVERSION = .3-rc4
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
@@ -496,10 +496,14 @@ endif
include $(srctree)/arch/$(ARCH)/Makefile
@@ -27086,7 +27077,7 @@
/* A parallel port */
--- linux-2.6.22.orig/include/linux/pci_ids.h
+++ linux-2.6.22/include/linux/pci_ids.h
-@@ -2221,6 +2221,7 @@
+@@ -2223,6 +2223,7 @@
#define PCI_DEVICE_ID_INTEL_82801EB_5 0x24d5
#define PCI_DEVICE_ID_INTEL_82801EB_6 0x24d6
#define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt5-6 new/patches.rt/patch-2.6.22.1-rt5-6
--- old/patches.rt/patch-2.6.22.1-rt5-6 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt5-6 2007-08-21 08:16:18.000000000 +0200
@@ -2,10 +2,9 @@
---
- Makefile | 2 +-
include/linux/quicklist.h | 19 ++++++++-----------
mm/quicklist.c | 8 ++------
- 3 files changed, 11 insertions(+), 18 deletions(-)
+ 2 files changed, 10 insertions(+), 17 deletions(-)
--- linux-2.6.22.orig/include/linux/quicklist.h
+++ linux-2.6.22/include/linux/quicklist.h
@@ -63,17 +62,6 @@
}
static inline void quicklist_free(int nr, void (*dtor)(void *), void *pp)
---- linux-2.6.22.orig/Makefile
-+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3-rc5
-+EXTRAVERSION = .3-rc6
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
--- linux-2.6.22.orig/mm/quicklist.c
+++ linux-2.6.22/mm/quicklist.c
@@ -58,11 +58,7 @@ void quicklist_trim(int nr, void (*dtor)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt6-7 new/patches.rt/patch-2.6.22.1-rt6-7
--- old/patches.rt/patch-2.6.22.1-rt6-7 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt6-7 2007-08-21 08:16:18.000000000 +0200
@@ -2,14 +2,13 @@
---
- Makefile | 2
include/linux/sched.h | 3
kernel/fork.c | 1
kernel/sched.c | 361 ++++++++++++++++++++++++++++----------------------
kernel/sched_debug.c | 7
kernel/sched_fair.c | 34 ++++
kernel/sched_rt.c | 14 -
- 7 files changed, 249 insertions(+), 173 deletions(-)
+ 6 files changed, 248 insertions(+), 172 deletions(-)
--- linux-2.6.22.orig/include/linux/sched.h
+++ linux-2.6.22/include/linux/sched.h
@@ -1008,14 +1007,3 @@
struct list_head *head, *curr;
struct task_struct *p;
int idx;
---- linux-2.6.22.orig/Makefile
-+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3-rc6
-+EXTRAVERSION = .3-rc7
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt7-8 new/patches.rt/patch-2.6.22.1-rt7-8
--- old/patches.rt/patch-2.6.22.1-rt7-8 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt7-8 2007-08-21 08:16:18.000000000 +0200
@@ -2,10 +2,9 @@
---
- Makefile | 2 +-
include/linux/sched.h | 4 ----
mm/slab.c | 2 +-
- 3 files changed, 2 insertions(+), 6 deletions(-)
+ 2 files changed, 1 insertion(+), 5 deletions(-)
--- linux-2.6.22.orig/include/linux/sched.h
+++ linux-2.6.22/include/linux/sched.h
@@ -20,17 +19,6 @@
static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
{
}
---- linux-2.6.22.orig/Makefile
-+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3-rc7
-+EXTRAVERSION = .3-rc8
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
--- linux-2.6.22.orig/mm/slab.c
+++ linux-2.6.22/mm/slab.c
@@ -2890,7 +2890,7 @@ static int cache_grow(struct kmem_cache
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt8-9 new/patches.rt/patch-2.6.22.1-rt8-9
--- old/patches.rt/patch-2.6.22.1-rt8-9 2007-08-16 10:03:39.000000000 +0200
+++ new/patches.rt/patch-2.6.22.1-rt8-9 2007-08-21 08:16:18.000000000 +0200
@@ -1,8 +1,7 @@
---
- Makefile | 2 +-
include/linux/wait.h | 10 ++++------
net/netfilter/nf_conntrack_proto_sctp.c.rej | 18 ++++++++++++++++++
- 3 files changed, 23 insertions(+), 7 deletions(-)
+ 2 files changed, 22 insertions(+), 6 deletions(-)
--- linux-2.6.22.orig/include/linux/wait.h
+++ linux-2.6.22/include/linux/wait.h
@@ -23,17 +22,6 @@
/*
* Waitqueues which are removed from the waitqueue_head at wakeup time
---- linux-2.6.22.orig/Makefile
-+++ linux-2.6.22/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 22
--EXTRAVERSION = .3-rc8
-+EXTRAVERSION = .3-rc9
- NAME = Holy Dancing Manatees, Batman!
-
- # *DOCUMENTATION*
--- /dev/null
+++ linux-2.6.22/net/netfilter/nf_conntrack_proto_sctp.c.rej
@@ -0,0 +1,18 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/preempt_sched_hooks.patch new/patches.rt/preempt_sched_hooks.patch
--- old/patches.rt/preempt_sched_hooks.patch 2007-07-22 01:42:10.000000000 +0200
+++ new/patches.rt/preempt_sched_hooks.patch 2007-08-21 08:16:18.000000000 +0200
@@ -75,14 +75,12 @@
Signed-off-by: Avi Kivity
---
- include/linux/preempt.h | 27 +++++++++++++++++++++++
+ include/linux/preempt.h | 27 ++++++++++++++++++++++++
include/linux/sched.h | 4 +++
- kernel/Kconfig.preempt | 4 +++
- kernel/sched.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 89 insertions(+), 0 deletions(-)
+ kernel/Kconfig.preempt | 5 ++++
+ kernel/sched.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 90 insertions(+)
-Index: linux-2.6.22/include/linux/preempt.h
-===================================================================
--- linux-2.6.22.orig/include/linux/preempt.h
+++ linux-2.6.22/include/linux/preempt.h
@@ -9,6 +9,7 @@
@@ -124,11 +122,9 @@
+#endif
+
#endif /* __LINUX_PREEMPT_H */
-Index: linux-2.6.22/include/linux/sched.h
-===================================================================
--- linux-2.6.22.orig/include/linux/sched.h
+++ linux-2.6.22/include/linux/sched.h
-@@ -1070,6 +1070,10 @@ struct task_struct {
+@@ -1073,6 +1073,10 @@ struct task_struct {
struct list_head run_list;
struct sched_entity se;
@@ -139,8 +135,6 @@
unsigned short ioprio;
#ifdef CONFIG_BLK_DEV_IO_TRACE
unsigned int btrace_seq;
-Index: linux-2.6.22/kernel/Kconfig.preempt
-===================================================================
--- linux-2.6.22.orig/kernel/Kconfig.preempt
+++ linux-2.6.22/kernel/Kconfig.preempt
@@ -133,6 +133,11 @@ config SPINLOCK_BKL
@@ -155,11 +149,9 @@
config PREEMPT_BKL
bool
depends on PREEMPT_RT || !SPINLOCK_BKL
-Index: linux-2.6.22/kernel/sched.c
-===================================================================
--- linux-2.6.22.orig/kernel/sched.c
+++ linux-2.6.22/kernel/sched.c
-@@ -1960,6 +1960,10 @@ static void __sched_fork(struct task_str
+@@ -1976,6 +1976,10 @@ static void __sched_fork(struct task_str
INIT_LIST_HEAD(&p->run_list);
p->se.on_rq = 0;
@@ -170,8 +162,8 @@
/*
* We mark the process as running here, but have not actually
* inserted it onto the runqueue yet. This guarantees that
-@@ -2046,6 +2050,50 @@ void sched_dead(struct task_struct *p)
- WARN_ON_ONCE(p->se.on_rq);
+@@ -2057,6 +2061,50 @@ void fastcall wake_up_new_task(struct ta
+ task_rq_unlock(rq, &flags);
}
+#ifdef CONFIG_PREEMPT_HOOKS
@@ -221,7 +213,7 @@
/**
* prepare_task_switch - prepare to switch tasks
* @rq: the runqueue preparing to switch
-@@ -2060,6 +2108,7 @@ void sched_dead(struct task_struct *p)
+@@ -2071,6 +2119,7 @@ void fastcall wake_up_new_task(struct ta
*/
static inline void prepare_task_switch(struct rq *rq, struct task_struct *next)
{
@@ -229,7 +221,7 @@
prepare_lock_switch(rq, next);
prepare_arch_switch(next);
}
-@@ -2111,6 +2160,7 @@ static inline void finish_task_switch(st
+@@ -2122,6 +2171,7 @@ static inline void finish_task_switch(st
prev_state = prev->state;
_finish_arch_switch(prev);
finish_lock_switch(rq, prev);
@@ -237,7 +229,7 @@
trace_stop_sched_switched(current);
/*
* Delay the final freeing of the mm or task, so that we dont have
-@@ -6972,6 +7022,10 @@ void __init sched_init(void)
+@@ -6993,6 +7043,10 @@ void __init sched_init(void)
set_load_weight(&init_task);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/redeclare_kdb_lock_as_raw.patch new/patches.rt/redeclare_kdb_lock_as_raw.patch
--- old/patches.rt/redeclare_kdb_lock_as_raw.patch 2007-07-18 12:15:13.000000000 +0200
+++ new/patches.rt/redeclare_kdb_lock_as_raw.patch 2007-08-21 08:16:18.000000000 +0200
@@ -13,11 +13,13 @@
signed-off-by: Sven-Thorsten Dietrich
-Index: linux-2.6.16/kdb/kdbmain.c
-===================================================================
---- linux-2.6.16.orig/kdb/kdbmain.c
-+++ linux-2.6.16/kdb/kdbmain.c
-@@ -54,7 +54,7 @@ atomic_t kdb_event;
+---
+ kdb/kdbmain.c | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.22.orig/kdb/kdbmain.c
++++ linux-2.6.22/kdb/kdbmain.c
+@@ -58,7 +58,7 @@ atomic_t kdb_8250;
* kdb_lock protects updates to kdb_initial_cpu. Used to
* single thread processors through the kernel debugger.
*/
++++++ patches.suse.tar.bz2 ++++++
++++ 4288 lines of diff (skipped)
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++++ post.sh ++++++
--- kernel-source/post.sh 2007-08-20 18:50:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/post.sh 2007-08-24 09:01:28.000000000 +0200
@@ -53,57 +53,70 @@
echo "available bootloader for your platform (e.g. grub, lilo, zipl, ...)."
}
-if [ -f /boot/grub/menu.lst -o \
- -f /etc/lilo.conf -o \
- -f /etc/elilo.conf -o \
- -f /etc/zipl.conf ] ; then
-
- if [ -f /etc/fstab ]; then
- if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \
- -i /boot/initrd-@KERNELRELEASE@; then
- echo "/sbin/mkinitrd failed" >&2
- exit 1
- fi
-
- # handle 10.2 and SLES10 SP1
- if [ -x /usr/lib/bootloader/bootloader_entry ]; then
- /usr/lib/bootloader/bootloader_entry \
- add \
- @FLAVOR@ \
- @KERNELRELEASE@ \
- @IMAGE@-@KERNELRELEASE@ \
- initrd-@KERNELRELEASE@
-
- # handle 10.1 and SLES10 GA
- elif [ -x /sbin/update-bootloader ]; then
- case @FLAVOR@ in
- (kdump|um)
- ;;
- (*)
- opt_xen_kernel=
- case @FLAVOR@ in
- xen*)
- set -- @FLAVOR@
- set -- ${1#xen}
- opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz
- ;;
- esac
-
- echo "bootloader_entry script unavailable, updating /boot/@IMAGE@"
- /sbin/update-bootloader \
- --image /boot/@IMAGE@ \
- --initrd /boot/initrd \
- --add \
- --force $opt_xen_kernel
-
- /sbin/update-bootloader --refresh
- ;;
- esac
- else
- message_install_bl
- fi
+run_bootloader () {
+ if [ -f /etc/sysconfig/bootloader ] &&
+ [ -f /boot/grub/menu.lst -o \
+ -f /etc/lilo.conf -o \
+ -f /etc/elilo.conf -o \
+ -f /etc/zipl.conf ]
+ then
+ return 0
+ else
+ return 1
+ fi
+}
+
+
+if [ -f /etc/fstab ]; then
+ if ! /sbin/mkinitrd -k /boot/@IMAGE@-@KERNELRELEASE@ \
+ -i /boot/initrd-@KERNELRELEASE@; then
+ echo "/sbin/mkinitrd failed" >&2
+ exit 1
+ fi
+
+ if run_bootloader ; then
+
+ # handle 10.2 and SLES10 SP1
+ if [ -x /usr/lib/bootloader/bootloader_entry ]; then
+ /usr/lib/bootloader/bootloader_entry \
+ add \
+ @FLAVOR@ \
+ @KERNELRELEASE@ \
+ @IMAGE@-@KERNELRELEASE@ \
+ initrd-@KERNELRELEASE@
+
+ # handle 10.1 and SLES10 GA
+ elif [ -x /sbin/update-bootloader ]; then
+ case @FLAVOR@ in
+ (kdump|um)
+ ;;
+ (*)
+ opt_xen_kernel=
+ case @FLAVOR@ in
+ xen*)
+ set -- @FLAVOR@
+ set -- ${1#xen}
+ opt_xen_kernel=--xen-kernel=/boot/xen${1:+-$1}.gz
+ ;;
+ esac
+
+ echo "bootloader_entry script unavailable, updating /boot/@IMAGE@"
+ /sbin/update-bootloader \
+ --image /boot/@IMAGE@ \
+ --initrd /boot/initrd \
+ --add \
+ --force $opt_xen_kernel
+
+ /sbin/update-bootloader --refresh
+ ;;
+ esac
else
- echo "Please run mkinitrd as soon as your system is complete."
- message_install_bl
+ message_install_bl
fi
+ fi
+else
+ echo "Please run mkinitrd as soon as your system is complete."
+ message_install_bl
fi
+
+# vim: set sts=4 sw=4 ts=8 noet:
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-08-20 18:50:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-08-24 09:01:12.000000000 +0200
@@ -24,6 +24,8 @@
patches.kernel.org/patch-2.6.22.1
patches.kernel.org/patch-2.6.22.1-2
patches.kernel.org/patch-2.6.22.2-3
+ patches.kernel.org/patch-2.6.22.3-4
+ patches.kernel.org/patch-2.6.22.4-5
########################################################
#
@@ -38,6 +40,8 @@
patches.rpmify/buildhost
patches.rpmify/cloneconfig.diff
+ patches.suse/squashfs.patch
+
# every patch below is optional
patches.suse/error-implicit-function-declaration.patch
patches.suse/supported-flag
@@ -54,7 +58,6 @@
# ia64
# i386
- patches.arch/i386-compat-vdso
# amd64 | x86-64 | x86_64
# 'Intel(r) Extended Memory 64 Technology' | 'Intel(r) EM64T'
@@ -172,6 +175,7 @@
patches.arch/ppc-ps3video-ps3-wip_ps3av-kill-boot-parameter.diff
patches.arch/ppc-ps3-storage-fix-probe-msgs.diff
patches.arch/ppc-ps3-storage-fix-probe-region-loop.diff
+ patches.arch/ppc-ps3-video-synmaster.patch
patches.arch/ppc-suse-spe-logo_logo-extern-in-header.diff
patches.suse/ppc-powerbook-usb-fn-key-default.patch
@@ -334,7 +338,6 @@
########################################################
patches.drivers/e1000-eeprom-cksum.patch
- patches.drivers/ati-sb700-sata-add-all-ids.patch
########################################################
# Storage
@@ -412,6 +415,7 @@
########################################################
patches.drivers/pci-rs690-disable-msi
patches.drivers/pci-rd580-disable-msi
+ patches.drivers/pci-rx790-disable-msi
########################################################
# sysfs / driver core
@@ -488,7 +492,6 @@
########################################################
# Suspend/Resume stuff
########################################################
- patches.fixes/suspend_check_for_invalid_mem.patch
########################################################
# S/390 patches from IBM
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org