Hello community,
here is the log from the commit of package kernel-source
checked in at Fri Feb 9 16:57:15 CET 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-02-01 20:20:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-02-09 07:14:59.000000000 +0100
@@ -1,0 +2,56 @@
+Wed Feb 7 22:03:57 CET 2007 - jeffm@suse.de
+
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+
+-------------------------------------------------------------------
+Wed Feb 7 14:53:33 CET 2007 - bwalle@suse.de
+
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+
+-------------------------------------------------------------------
+Tue Feb 6 18:36:17 CET 2007 - gregkh@suse.de
+
+- update to 2.6.20
+
+-------------------------------------------------------------------
+Tue Feb 6 08:16:04 CET 2007 - teheo@suse.de
+
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+
+-------------------------------------------------------------------
+Tue Feb 6 01:46:49 CET 2007 - jjohanse@suse.de
+
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ #239147, #221567, #240982, #218961, #219309
+
+-------------------------------------------------------------------
+Mon Feb 5 16:03:07 CET 2007 - jbeulich@novell.com
+
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-iseries64.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-um.changes: same change
kernel-vanilla.changes: same change
Old:
----
linux-2.6.19.tar.bz2
New:
----
linux-2.6.20.tar.bz2
needed_space_in_mb
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-bigsmp (Version 2.6.20_rc7)
+# spec file for package kernel-bigsmp (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: Kernel with PAE Support
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-bigsmp-nongpl
@@ -54,7 +54,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -127,12 +127,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-bigsmp-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-bigsmp-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -152,8 +152,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -212,7 +212,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -253,7 +253,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -425,8 +425,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-bigsmp} \
@@ -474,6 +474,44 @@
%files -f kernel.files
%changelog -n kernel-bigsmp
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-debug (Version 2.6.20_rc7)
+# spec file for package kernel-debug (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: A Debug Version of the Kernel
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-debug-nongpl
@@ -60,7 +60,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -132,12 +132,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-debug-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-debug-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -157,8 +157,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -217,7 +217,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -258,7 +258,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -430,8 +430,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-debug} \
@@ -479,6 +479,44 @@
%files -f kernel.files
%changelog -n kernel-debug
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-default (Version 2.6.20_rc7)
+# spec file for package kernel-default (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-default-nongpl
@@ -82,7 +82,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -153,12 +153,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-default-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-default-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -178,8 +178,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -238,7 +238,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -279,7 +279,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -451,8 +451,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-default} \
@@ -500,6 +500,44 @@
%files -f kernel.files
%changelog -n kernel-default
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:49.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-dummy (Version 2.6.20_rc7)
+# spec file for package kernel-dummy (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Autoreqprov: off
Summary: Internal dummy package for synchronizing release numbers
Group: System/Kernel
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%install
@@ -40,6 +40,44 @@
/etc/dummy
%changelog -n kernel-dummy
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-iseries64.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-iseries64 (Version 2.6.20_rc7)
+# spec file for package kernel-iseries64 (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: 64-Bit Kernel for iSeries
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-iseries64-nongpl
@@ -57,7 +57,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -128,12 +128,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-iseries64-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-iseries64-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -153,8 +153,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -213,7 +213,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -254,7 +254,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -426,8 +426,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-iseries64} \
@@ -475,6 +475,44 @@
%files -f kernel.files
%changelog -n kernel-iseries64
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-kdump (Version 2.6.20_rc7)
+# spec file for package kernel-kdump (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: kernel for kdump
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-kdump-nongpl
@@ -63,7 +63,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -137,12 +137,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-kdump-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-kdump-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -162,8 +162,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -222,7 +222,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -263,7 +263,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -435,8 +435,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-kdump} \
@@ -484,6 +484,44 @@
%files -f kernel.files
%changelog -n kernel-kdump
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-ppc64 (Version 2.6.20_rc7)
+# spec file for package kernel-ppc64 (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -27,7 +27,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: Kernel for ppc64 Systems
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
@@ -36,7 +36,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-ppc64-nongpl
@@ -58,7 +58,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -142,12 +142,12 @@
Tom Gall
see /usr/src/linux-pmac-benh/CREDITS for more details.
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-ppc64-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-ppc64-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -167,8 +167,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -227,7 +227,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -268,7 +268,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -440,8 +440,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-ppc64} \
@@ -489,6 +489,44 @@
%files -f kernel.files
%changelog -n kernel-ppc64
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:50.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:50.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-s390 (Version 2.6.20_rc7)
+# spec file for package kernel-s390 (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: The Standard Kernel
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-s390-nongpl
@@ -54,7 +54,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -125,12 +125,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-s390-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-s390-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -150,8 +150,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -210,7 +210,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -251,7 +251,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -423,8 +423,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-s390} \
@@ -472,6 +472,44 @@
%files -f kernel.files
%changelog -n kernel-s390
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-source (Version 2.6.20_rc7)
+# spec file for package kernel-source (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -31,9 +31,9 @@
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
%endif
PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source2: source-post.sh
Source11: post.sh
@@ -100,11 +100,11 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "Please get a copy of linux-2.6.19.tar.bz2 from" \
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "Please get a copy of linux-2.6.20.tar.bz2 from" \
"ftp://ftp.kernel.org/pub/linux/kernel/v2.6/."
fi
echo "Architecture symbol(s): %symbols"
@@ -115,30 +115,30 @@
mkdir -p $RPM_BUILD_ROOT/usr/src
cd $RPM_BUILD_ROOT/usr/src
# Unpack the vanilla kernel sources
-bzip2 -cd %_sourcedir/linux-2.6.19.tar.bz2 \
+bzip2 -cd %_sourcedir/linux-2.6.20.tar.bz2 \
| tar xf -
-cd linux-2.6.19
+cd linux-2.6.20
# Hello Linus: hint, hint ...
chmod -Rf a+rX,g-w,o-w .
# Apply the patches needed for this architecture.
%_sourcedir/guards %symbols < %_sourcedir/series.conf \
- > %_builddir/kernel-source-2.6.20_rc7/kernel-source.patches
-for patch in $(< %_builddir/kernel-source-2.6.20_rc7/kernel-source.patches); do
- if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.20_rc7/$patch; then
+ > %_builddir/kernel-source-2.6.20/kernel-source.patches
+for patch in $(< %_builddir/kernel-source-2.6.20/kernel-source.patches); do
+ if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.20/$patch; then
echo "*** Patch $patch failed ***"
exit 1
fi
done
-%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.20_rc7 %source_rel
-KERNELRELEASE=2.6.20-rc7-%source_rel
+%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.20 %source_rel
+KERNELRELEASE=2.6.20-%source_rel
cat > %_builddir/%{name}-%{version}/.rpm-defs < %_builddir/kernel-source-2.6.20_rc7/kernel-$flavor.patches
- diff -q %_builddir/kernel-source-2.6.20_rc7/kernel-{source,$flavor}.patches \
+ > %_builddir/kernel-source-2.6.20/kernel-$flavor.patches
+ diff -q %_builddir/kernel-source-2.6.20/kernel-{source,$flavor}.patches \
|| continue
o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor
mkdir -p $o
@@ -289,6 +289,44 @@
%files -f kernel-source.files
%changelog -n kernel-source
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-syms (Version 2.6.20_rc7)
+# spec file for package kernel-syms (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -51,10 +51,10 @@
Autoreqprov: off
Summary: Kernel Symbol Versions (modversions)
Group: Development/Sources
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Requires: linux
-Requires: kernel-source = 2.6.20_rc7-%release
+Requires: kernel-source = 2.6.20-%release
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -87,7 +87,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%install
@@ -132,6 +132,44 @@
/lib/modules/*/modules.alias
%changelog -n kernel-syms
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-um.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-um (Version 2.6.20_rc7)
+# spec file for package kernel-um (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: The User Mode Linux kernel.
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-um-nongpl
@@ -59,7 +59,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -133,12 +133,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-um-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-um-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -158,8 +158,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -218,7 +218,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -259,7 +259,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -431,8 +431,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-um} \
@@ -480,6 +480,44 @@
%files -f kernel.files
%changelog -n kernel-um
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.Mn2063/_old 2007-02-09 16:49:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Mn2063/_new 2007-02-09 16:49:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kernel-vanilla (Version 2.6.20_rc7)
+# spec file for package kernel-vanilla (Version 2.6.20)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -28,7 +28,7 @@
# arch/ia64/scripts/unwcheck.py
BuildRequires: python
%endif
-Version: 2.6.20_rc7
+Version: 2.6.20
Release: 1
Summary: The Standard Kernel - without any SUSE patches
License: GNU General Public License (GPL)
@@ -37,7 +37,7 @@
#Conflicts: kernel
%else
%if !%build_xen
-Provides: kernel = 2.6.20_rc7-%source_rel
+Provides: kernel = 2.6.20-%source_rel
%endif
%endif
Provides: kernel-vanilla-nongpl
@@ -74,7 +74,7 @@
Conflicts: apparmor-parser <= 2.0-21.1
Autoreqprov: on
%define my_builddir %_builddir/%{name}-%{version}
-Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2
+Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.tar.bz2
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
@@ -145,12 +145,12 @@
-Source Timestamp: 2007/02/01 13:34:44 UTC
+Source Timestamp: 2007/02/07 21:04:19 UTC
%prep
-if ! [ -e %_sourcedir/linux-2.6.19.tar.bz2 ]; then
- echo "The kernel-vanilla-2.6.20_rc7.nosrc.rpm package does not contain the" \
- "complete sources. Please install kernel-source-2.6.20_rc7.src.rpm."
+if ! [ -e %_sourcedir/linux-2.6.20.tar.bz2 ]; then
+ echo "The kernel-vanilla-2.6.20.nosrc.rpm package does not contain the" \
+ "complete sources. Please install kernel-source-2.6.20.src.rpm."
exit 1
fi
symbols=$(
@@ -170,8 +170,8 @@
%_sourcedir/guards $symbols $how < %_sourcedir/supported.conf \
) | sort | uniq -u | sed -e 's:$: '"$how"':'
done
-) | sed -e 's,.*/,,' | sort > linux-2.6.19/Module.supported
-cd linux-2.6.19
+) | sed -e 's,.*/,,' | sort > linux-2.6.20/Module.supported
+cd linux-2.6.20
# Find out for which architecture to build. We do this here, and use the
# result in the %build and %install sections.
#
@@ -230,7 +230,7 @@
%build
source .rpm-defs
-cd linux-2.6.19
+cd linux-2.6.20
cp .config .config.orig
%if %{tolerate_unknown_new_config_options}
MAKE_ARGS="$MAKE_ARGS -k"
@@ -271,7 +271,7 @@
export NO_BRP_STALE_LINK_ERROR=yes
# skip long-running sanity checks
export NO_BRP_NOEXECSTACK=yes
-cd linux-2.6.19
+cd linux-2.6.20
rm -rf %buildroot
mkdir -p %buildroot/boot
# (Could strip out non-public symbols.)
@@ -443,8 +443,8 @@
# Indicate the ABI badness in build result emails.
echo "KABI BADNESS $KABI" > %_rpmdir/%_arch/mbuild_subject.tag
fi
-# We were building in %my_builddir/linux-2.6.19, but the sources will
-# later be installed in /usr/src/linux-2.6.19-%source_rel. Fix up the
+# We were building in %my_builddir/linux-2.6.20, but the sources will
+# later be installed in /usr/src/linux-2.6.20-%source_rel. Fix up the
# build symlink.
rm -f %buildroot/lib/modules/$KERNELRELEASE/{source,build}
ln -s /usr/src/linux-${KERNELRELEASE%%-vanilla} \
@@ -492,6 +492,44 @@
%files -f kernel.files
%changelog -n kernel-vanilla
+* Wed Feb 07 2007 - jeffm@suse.de
+- patches.fixes/fix-key-serial-number-collision-handling.diff:
+ keys: Fix key serial number collision handling (243003).
+* Wed Feb 07 2007 - bwalle@suse.de
+- patches.xen/dynamic-kernel-command-xen.patch:
+ added patch that makes the command line dynamic in Xen (this
+ is required to build, but test was impossible because the Xen
+ patches didn't even apply -- so, please Xen team, please adapt
+ after you enable it)
+* Tue Feb 06 2007 - gregkh@suse.de
+- update to 2.6.20
+* Tue Feb 06 2007 - teheo@suse.de
+- patches.drivers/libata-fix-jmicron-quirk: ahci/pata_jmicron:
+ fix JMicron quirk.
+- patches.drivers/libata-ide-fix-drive-side-80c-detection:
+ libata/ide: fix drive side 80c cable detection (237164).
+- patches.drivers/libata-pata_amd-fix-cable-detection: pata_amd:
+ fix an obvious bug in cable detection.
+- patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers:
+ ide: clear bmdma status in ide_intr() for ICHx controllers
+ (revised #4) (240307).
+- patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status:
+ ide: remove clearing bmdma status from cdrom_decode_status()
+ (rev #4) (240307).
+* Tue Feb 06 2007 - jjohanse@suse.de
+- patches.suse/apparmor: AppArmor update in place of patch. Fixes
+ [#239147], #221567, #240982, #218961, #219309
+* Mon Feb 05 2007 - jbeulich@novell.com
+- patches.xen/xen3-patch-2.6.20-rc5: Replace by ...
+- patches.xen/xen3-patch-2.6.20-rc6: 2.6.20-rc6.
+- patches.xen/xen-blkif-bimodal: Replace by ...
+- patches.xen/xen-protocol-bimodal: bimodal: header file with protocol
+ names.
+- patches.xen/xen-blkback-bimodal: multiprotocol blkback drivers.
+- patches.xen/xen-blkback-bimodal-suse: backward compatibility.
+- patches.xen/xen-blkfront-bimodal: bimodal: blkfront.
+- patches.xen/xen-fbfront-bimodal: bimodal: pvfb frontend.
+- Other Xen patches: Refresh.
* Thu Feb 01 2007 - olh@suse.de
- update to 2.6.20-rc7
* Wed Jan 31 2007 - bwalle@suse.de
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-02-01 20:19:59.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-02-09 07:14:56.000000000 +0100
@@ -1 +1 @@
-2007/02/01 13:34:44 UTC
+2007/02/07 21:04:19 UTC
++++++ kabi.tar.bz2 ++++++
++++++ linux-2.6.19.tar.bz2 -> linux-2.6.20.tar.bz2 ++++++
kernel-source/linux-2.6.19.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/linux-2.6.20.tar.bz2 differ: byte 11, line 1
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers new/patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers
--- old/patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers 2007-02-06 08:16:25.000000000 +0100
@@ -0,0 +1,188 @@
+From: Albert Lee
+Subject: [PATCH 1/2] ide: clear bmdma status in ide_intr() for ICHx controllers (revised #4)
+References: 240307
+Patch-Mainline: 2.6.21
+
+patch 1/2 (revised):
+- Fix drive->waiting_for_dma to work with CDB-intr devices.
+- Do the dma status clearing in ide_intr() and add a new hwif->ide_dma_clear_irq for Intel ICHx controllers.
+
+Signed-off-by: Albert Lee
+Signed-off-by: Tejun Heo
+---
+ drivers/ide/ide-cd.c | 8 ++++++
+ drivers/ide/ide-io.c | 11 ++++++++
+ drivers/ide/ide.c | 1
+ drivers/ide/pci/piix.c | 63 +++++++++++++++++++++++++++++++++++++------------
+ include/linux/ide.h | 1
+ 5 files changed, 69 insertions(+), 15 deletions(-)
+
+Index: linux-2.6.19/drivers/ide/ide-cd.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/ide-cd.c
++++ linux-2.6.19/drivers/ide/ide-cd.c
+@@ -930,6 +930,10 @@ static ide_startstop_t cdrom_start_packe
+ HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
+
+ if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
++ /* waiting for CDB interrupt, not DMA yet. */
++ if (info->dma)
++ drive->waiting_for_dma = 0;
++
+ /* packet command */
+ ide_execute_command(drive, WIN_PACKETCMD, handler, ATAPI_WAIT_PC, cdrom_timer_expiry);
+ return ide_started;
+@@ -972,6 +976,10 @@ static ide_startstop_t cdrom_transfer_pa
+ /* Check for errors. */
+ if (cdrom_decode_status(drive, DRQ_STAT, NULL))
+ return ide_stopped;
++
++ /* Ok, next interrupt will be DMA interrupt. */
++ if (info->dma)
++ drive->waiting_for_dma = 1;
+ } else {
+ /* Otherwise, we must wait for DRQ to get set. */
+ if (ide_wait_stat(&startstop, drive, DRQ_STAT,
+Index: linux-2.6.19/drivers/ide/ide-io.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/ide-io.c
++++ linux-2.6.19/drivers/ide/ide-io.c
+@@ -1646,6 +1646,17 @@ irqreturn_t ide_intr (int irq, void *dev
+ del_timer(&hwgroup->timer);
+ spin_unlock(&ide_lock);
+
++ /* Some controllers might set DMA INTR no matter DMA or PIO;
++ * bmdma status might need to be cleared even for
++ * PIO interrupts to prevent spurious/lost irq.
++ */
++ if (hwif->ide_dma_clear_irq && !(drive->waiting_for_dma))
++ /* ide_dma_end() needs bmdma status for error checking.
++ * So, skip clearing bmdma status here and leave it
++ * to ide_dma_end() if this is dma interrupt.
++ */
++ hwif->ide_dma_clear_irq(drive);
++
+ if (drive->unmask)
+ local_irq_enable_in_hardirq();
+ /* service this interrupt, may set handler for next interrupt */
+Index: linux-2.6.19/drivers/ide/ide.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/ide.c
++++ linux-2.6.19/drivers/ide/ide.c
+@@ -503,6 +503,7 @@ static void ide_hwif_restore(ide_hwif_t
+ hwif->ide_dma_on = tmp_hwif->ide_dma_on;
+ hwif->ide_dma_off_quietly = tmp_hwif->ide_dma_off_quietly;
+ hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq;
++ hwif->ide_dma_clear_irq = tmp_hwif->ide_dma_clear_irq;
+ hwif->ide_dma_host_on = tmp_hwif->ide_dma_host_on;
+ hwif->ide_dma_host_off = tmp_hwif->ide_dma_host_off;
+ hwif->ide_dma_lostirq = tmp_hwif->ide_dma_lostirq;
+Index: linux-2.6.19/drivers/ide/pci/piix.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/pci/piix.c
++++ linux-2.6.19/drivers/ide/pci/piix.c
+@@ -411,17 +411,14 @@ fast_ata_pio:
+ }
+
+ /**
+- * init_chipset_piix - set up the PIIX chipset
+- * @dev: PCI device to set up
+- * @name: Name of the device
++ * piix_is_ichx - check if ICHx
++ * @dev: PCI device to check
+ *
+- * Initialize the PCI device as required. For the PIIX this turns
+- * out to be nice and simple
++ * returns 1 if ICHx, 0 otherwise.
+ */
+-
+-static unsigned int __devinit init_chipset_piix (struct pci_dev *dev, const char *name)
++static int piix_is_ichx(struct pci_dev *dev)
+ {
+- switch(dev->device) {
++ switch (dev->device) {
+ case PCI_DEVICE_ID_INTEL_82801EB_1:
+ case PCI_DEVICE_ID_INTEL_82801AA_1:
+ case PCI_DEVICE_ID_INTEL_82801AB_1:
+@@ -439,19 +436,51 @@ static unsigned int __devinit init_chips
+ case PCI_DEVICE_ID_INTEL_ICH7_21:
+ case PCI_DEVICE_ID_INTEL_ESB2_18:
+ case PCI_DEVICE_ID_INTEL_ICH8_6:
+- {
+- unsigned int extra = 0;
+- pci_read_config_dword(dev, 0x54, &extra);
+- pci_write_config_dword(dev, 0x54, extra|0x400);
+- }
+- default:
+- break;
++ return 1;
++ }
++
++ return 0;
++}
++
++/**
++ * init_chipset_piix - set up the PIIX chipset
++ * @dev: PCI device to set up
++ * @name: Name of the device
++ *
++ * Initialize the PCI device as required. For the PIIX this turns
++ * out to be nice and simple
++ */
++
++static unsigned int __devinit init_chipset_piix (struct pci_dev *dev, const char *name)
++{
++ if (piix_is_ichx(dev)) {
++ unsigned int extra = 0;
++ pci_read_config_dword(dev, 0x54, &extra);
++ pci_write_config_dword(dev, 0x54, extra|0x400);
+ }
+
+ return 0;
+ }
+
+ /**
++ * piix_dma_clear_irq - clear BMDMA status
++ * @drive: IDE drive to clear
++ *
++ * Called from ide_intr() for PIO interrupts
++ * to clear BMDMA status as needed by ICHx
++ */
++static void piix_dma_clear_irq(ide_drive_t *drive)
++{
++ ide_hwif_t *hwif = HWIF(drive);
++ u8 dma_stat;
++
++ /* clear the INTR & ERROR bits */
++ dma_stat = hwif->INB(hwif->dma_status);
++ /* Should we force the bit as well ? */
++ hwif->OUTB(dma_stat, hwif->dma_status);
++}
++
++/**
+ * init_hwif_piix - fill in the hwif for the PIIX
+ * @hwif: IDE interface
+ *
+@@ -487,6 +516,10 @@ static void __devinit init_hwif_piix(ide
+ if (!hwif->dma_base)
+ return;
+
++ /* ICHx need to clear the bmdma status for all interrupts */
++ if (piix_is_ichx(hwif->pci_dev))
++ hwif->ide_dma_clear_irq = &piix_dma_clear_irq;
++
+ hwif->atapi_dma = 1;
+ hwif->ultra_mask = 0x3f;
+ hwif->mwdma_mask = 0x06;
+Index: linux-2.6.19/include/linux/ide.h
+===================================================================
+--- linux-2.6.19.orig/include/linux/ide.h
++++ linux-2.6.19/include/linux/ide.h
+@@ -727,6 +727,7 @@ typedef struct hwif_s {
+ int (*ide_dma_on)(ide_drive_t *drive);
+ int (*ide_dma_off_quietly)(ide_drive_t *drive);
+ int (*ide_dma_test_irq)(ide_drive_t *drive);
++ void (*ide_dma_clear_irq)(ide_drive_t *drive);
+ int (*ide_dma_host_on)(ide_drive_t *drive);
+ int (*ide_dma_host_off)(ide_drive_t *drive);
+ int (*ide_dma_lostirq)(ide_drive_t *drive);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status new/patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status
--- old/patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status 2007-02-06 08:16:25.000000000 +0100
@@ -0,0 +1,64 @@
+From: Albert Lee
+Subject: [PATCH 2/2] ide: remove clearing bmdma status from cdrom_decode_status() (rev #4)
+References: 240307
+Patch-Mainline: 2.6.21
+
+patch 2/2:
+ Remove clearing bmdma status from cdrom_decode_status() since ATA devices might need it as well.
+ (http://lkml.org/lkml/2006/12/4/201 and http://lkml.org/lkml/2006/11/15/94)
+
+Signed-off-by: Albert Lee
+Signed-off-by: Tejun Heo
+---
+ drivers/ide/ide-cd.c | 7 -------
+ drivers/ide/pci/piix.c | 4 ----
+ include/linux/ide.h | 1 -
+ 3 files changed, 12 deletions(-)
+
+Index: linux-2.6.19/drivers/ide/ide-cd.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/ide-cd.c
++++ linux-2.6.19/drivers/ide/ide-cd.c
+@@ -687,15 +687,8 @@ static void ide_dump_status_no_sense(ide
+ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
+ {
+ struct request *rq = HWGROUP(drive)->rq;
+- ide_hwif_t *hwif = HWIF(drive);
+ int stat, err, sense_key;
+
+- /* We may have bogus DMA interrupts in PIO state here */
+- if (HWIF(drive)->dma_status && hwif->atapi_irq_bogon) {
+- stat = hwif->INB(hwif->dma_status);
+- /* Should we force the bit as well ? */
+- hwif->OUTB(stat, hwif->dma_status);
+- }
+ /* Check for errors. */
+ stat = HWIF(drive)->INB(IDE_STATUS_REG);
+ if (stat_ret)
+Index: linux-2.6.19/drivers/ide/pci/piix.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/pci/piix.c
++++ linux-2.6.19/drivers/ide/pci/piix.c
+@@ -502,10 +502,6 @@ static void __devinit init_hwif_piix(ide
+ /* This is a painful system best to let it self tune for now */
+ return;
+ }
+- /* ESB2 appears to generate spurious DMA interrupts in PIO mode
+- when in native mode */
+- if (hwif->pci_dev->device == PCI_DEVICE_ID_INTEL_ESB2_18)
+- hwif->atapi_irq_bogon = 1;
+
+ hwif->autodma = 0;
+ hwif->tuneproc = &piix_tune_drive;
+Index: linux-2.6.19/include/linux/ide.h
+===================================================================
+--- linux-2.6.19.orig/include/linux/ide.h
++++ linux-2.6.19/include/linux/ide.h
+@@ -797,7 +797,6 @@ typedef struct hwif_s {
+ unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */
+ unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
+ unsigned err_stops_fifo : 1; /* 1=data FIFO is cleared by an error */
+- unsigned atapi_irq_bogon : 1; /* Generates spurious DMA interrupts in PIO mode */
+
+ struct device gendev;
+ struct completion gendev_rel_comp; /* To deal with device release() */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-ide-fix-drive-side-80c-detection new/patches.drivers/libata-ide-fix-drive-side-80c-detection
--- old/patches.drivers/libata-ide-fix-drive-side-80c-detection 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/libata-ide-fix-drive-side-80c-detection 2007-02-06 08:16:25.000000000 +0100
@@ -0,0 +1,40 @@
+From: Tejun Heo
+Subject: [PATCH] libata/ide: fix drive side 80c cable detection
+References: 237164
+Patch-Mainline: 2.6.20-x or 2.6.21
+
+Drive side 80c cable detection was wrong on both ide and libata.
+Fix it.
+
+Signed-off-by: Tejun Heo
+---
+ drivers/ide/ide-iops.c | 2 ++
+ include/linux/ata.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+Index: linux-2.6.19/drivers/ide/ide-iops.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ide/ide-iops.c
++++ linux-2.6.19/drivers/ide/ide-iops.c
+@@ -607,6 +607,8 @@ u8 eighty_ninty_three (ide_drive_t *driv
+ if(!(drive->id->hw_config & 0x4000))
+ return 0;
+ #endif /* CONFIG_IDEDMA_IVB */
++ if (!(drive->id->hw_config & 0x2000))
++ return 0;
+ return 1;
+ }
+
+Index: linux-2.6.19/include/linux/ata.h
+===================================================================
+--- linux-2.6.19.orig/include/linux/ata.h
++++ linux-2.6.19/include/linux/ata.h
+@@ -347,7 +347,7 @@ static inline int ata_drive_40wire(const
+ {
+ if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
+ return 0; /* SATA */
+- if (dev_id[93] & 0x4000)
++ if ((dev_id[93] & 0xE000) == 0x6000)
+ return 0; /* 80 wire */
+ return 1;
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-initialize-variables.patch new/patches.drivers/libata-initialize-variables.patch
--- old/patches.drivers/libata-initialize-variables.patch 2007-01-25 20:47:24.000000000 +0100
+++ new/patches.drivers/libata-initialize-variables.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-Summary: fix ipr SATA SAS
-From: bjking1@us.ibm.com
-References: 215625
-
-http://www.spinics.net/lists/linux-ide/msg06796.html
-[PATCH] libata: initialize qc->dma_dir to DMA_NONE
-
-http://www.spinics.net/lists/linux-ide/msg06811.html
-[PATCH 1/3] libata: Fixup n_elem initialization
-
-http://www.spinics.net/lists/linux-ide/msg06810.html
-[PATCH 2/3] libata: Initialize nbytes for internal sg commands
-
-http://www.spinics.net/lists/linux-ide/msg06812.html
-[PATCH 3/3] libata: Initialize qc->pad_len
-
-Signed-off-by: Olaf Hering
-
----
- drivers/ata/libata-core.c | 1 +
- 1 files changed, 1 insertion(+)
-
---- linux-2.6.19.orig/drivers/ata/libata-core.c
-+++ linux-2.6.19/drivers/ata/libata-core.c
-@@ -1250,6 +1250,7 @@ unsigned ata_exec_internal_sg(struct ata
-
- ata_sg_init(qc, sg, n_elem);
- qc->nsect = buflen / ATA_SECT_SIZE;
-+ qc->nbytes = buflen;
- }
-
- qc->private_data = &wait;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-pata_amd-fix-cable-detection new/patches.drivers/libata-pata_amd-fix-cable-detection
--- old/patches.drivers/libata-pata_amd-fix-cable-detection 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.drivers/libata-pata_amd-fix-cable-detection 2007-02-06 08:16:25.000000000 +0100
@@ -0,0 +1,37 @@
+From htejun@gmail.com Tue Feb 6 04:25:05 2007
+Subject: [PATCH libata-dev#upstream-fixes] pata_amd: fix an obvious bug in cable detection
+Patch-Mainline: 2.6.20-X or 2.6.21
+
+80c test mask is at bits 18 and 19 of EIDE Controller Configuration
+not 22 and 23. Fix it.
+
+Signed-off-by: Tejun Heo
+---
+This makes unreliable cable detection even more unreliable. Please
+consider for -stable. Thanks.
+
+ drivers/ata/pata_amd.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-2.6.19/drivers/ata/pata_amd.c
+===================================================================
+--- linux-2.6.19.orig/drivers/ata/pata_amd.c
++++ linux-2.6.19/drivers/ata/pata_amd.c
+@@ -128,7 +128,7 @@ static void timing_setup(struct ata_port
+
+ static int amd_pre_reset(struct ata_port *ap)
+ {
+- static const u32 bitmask[2] = {0x03, 0xC0};
++ static const u32 bitmask[2] = {0x03, 0x0C};
+ static const struct pci_bits amd_enable_bits[] = {
+ { 0x40, 1, 0x02, 0x02 },
+ { 0x40, 1, 0x01, 0x01 }
+@@ -247,7 +247,7 @@ static void amd133_set_dmamode(struct at
+ */
+
+ static int nv_pre_reset(struct ata_port *ap) {
+- static const u8 bitmask[2] = {0x03, 0xC0};
++ static const u8 bitmask[2] = {0x03, 0x0C};
+ static const struct pci_bits nv_enable_bits[] = {
+ { 0x50, 1, 0x02, 0x02 },
+ { 0x50, 1, 0x01, 0x01 }
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/fix-key-serial-number-collision-handling.diff new/patches.fixes/fix-key-serial-number-collision-handling.diff
--- old/patches.fixes/fix-key-serial-number-collision-handling.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/fix-key-serial-number-collision-handling.diff 2007-02-07 22:04:19.000000000 +0100
@@ -0,0 +1,91 @@
+From: David Howells
+Subject: [PATCH] keys: Fix key serial number collision handling
+References: 243003
+Patch-mainline: 2.6.21-rc1
+
+
+Fix the key serial number collision avoidance code in key_alloc_serial().
+
+This didn't use to be so much of a problem as the key serial numbers were
+allocated from a simple incremental counter, and it would have to go through
+two billion keys before it could possibly encounter a collision. However, now
+that random numbers are used instead, collisions are much more likely.
+
+This is fixed by finding a hole in the rbtree where the next unused serial
+number ought to be and using that by going almost back to the top of the
+insertion routine and redoing the insertion with the new serial number rather
+than trying to be clever and attempting to work out the insertion point
+pointer directly.
+
+Signed-Off-By: David Howells
+Acked-by: Jeff Mahoney
+---
+
+ security/keys/key.c | 33 ++++++++++++++-------------------
+ 1 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/security/keys/key.c b/security/keys/key.c
+index ac9326c..700400d 100644
+--- a/security/keys/key.c
++++ b/security/keys/key.c
+@@ -188,6 +188,7 @@ static inline void key_alloc_serial(stru
+
+ spin_lock(&key_serial_lock);
+
++attempt_insertion:
+ parent = NULL;
+ p = &key_serial_tree.rb_node;
+
+@@ -202,39 +203,33 @@ static inline void key_alloc_serial(stru
+ else
+ goto serial_exists;
+ }
+- goto insert_here;
++
++ /* we've found a suitable hole - arrange for this key to occupy it */
++ rb_link_node(&key->serial_node, parent, p);
++ rb_insert_color(&key->serial_node, &key_serial_tree);
++
++ spin_unlock(&key_serial_lock);
++ return;
+
+ /* we found a key with the proposed serial number - walk the tree from
+ * that point looking for the next unused serial number */
+ serial_exists:
+ for (;;) {
+ key->serial++;
+- if (key->serial < 2)
+- key->serial = 2;
+-
+- if (!rb_parent(parent))
+- p = &key_serial_tree.rb_node;
+- else if (rb_parent(parent)->rb_left == parent)
+- p = &(rb_parent(parent)->rb_left);
+- else
+- p = &(rb_parent(parent)->rb_right);
++ if (key->serial < 3) {
++ key->serial = 3;
++ goto attempt_insertion;
++ }
+
+ parent = rb_next(parent);
+ if (!parent)
+- break;
++ goto attempt_insertion;
+
+ xkey = rb_entry(parent, struct key, serial_node);
+ if (key->serial < xkey->serial)
+- goto insert_here;
++ goto attempt_insertion;
+ }
+
+- /* we've found a suitable hole - arrange for this key to occupy it */
+-insert_here:
+- rb_link_node(&key->serial_node, parent, p);
+- rb_insert_color(&key->serial_node, &key_serial_tree);
+-
+- spin_unlock(&key_serial_lock);
+-
+ } /* end key_alloc_serial() */
+
+ /*****************************************************************************/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/oom-warning new/patches.fixes/oom-warning
--- old/patches.fixes/oom-warning 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.fixes/oom-warning 2007-02-07 08:33:52.000000000 +0100
@@ -11,9 +11,9 @@
mm/page_alloc.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletion(-)
---- linux-2.6.19.orig/mm/page_alloc.c
-+++ linux-2.6.19/mm/page_alloc.c
-@@ -1366,7 +1366,13 @@ nofail_alloc:
+--- linux-2.6.20.orig/mm/page_alloc.c
++++ linux-2.6.20/mm/page_alloc.c
+@@ -1365,7 +1365,13 @@ nofail_alloc:
nopage:
if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) {
++++++ patches.kernel.org.tar.bz2 ++++++
++++ 621158 lines of diff (skipped)
++++++ patches.suse.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/apparmor new/patches.suse/apparmor
--- old/patches.suse/apparmor 2007-01-13 11:00:22.000000000 +0100
+++ new/patches.suse/apparmor 2007-02-06 08:40:36.000000000 +0100
@@ -1,37 +1,15 @@
-From: tonyj@suse.de
+From: jjohansen@suse.de
Subject: AppArmor (SubDomain)
Patch-mainline: no
AppArmor security module (previously called SubDomain)
Patch is not in mainline -- pending code submission to lkml
+Module version
+svn co -r 341 https://forgesvn1.novell.com/svn/apparmor/trunk/module/apparmor
- security/Kconfig | 1
- security/Makefile | 1
- security/apparmor/Kbuild | 10
- security/apparmor/Kconfig | 9
- security/apparmor/Makefile | 28
- security/apparmor/apparmor.h | 338 +++++
- security/apparmor/apparmorfs.c | 432 +++++++
- security/apparmor/capabilities.c | 54
- security/apparmor/inline.h | 335 +++++
- security/apparmor/list.c | 268 ++++
- security/apparmor/lsm.c | 899 ++++++++++++++
- security/apparmor/main.c | 1681 +++++++++++++++++++++++++++
- security/apparmor/match/Kbuild | 6
- security/apparmor/match/Makefile | 5
- security/apparmor/match/match.h | 132 ++
- security/apparmor/match/match_default.c | 57
- security/apparmor/match/match_pcre.c | 169 ++
- security/apparmor/match/pcre_exec.c | 1945 ++++++++++++++++++++++++++++++++
- security/apparmor/match/pcre_exec.h | 308 +++++
- security/apparmor/match/pcre_tables.h | 184 +++
- security/apparmor/module_interface.c | 846 +++++++++++++
- security/apparmor/module_interface.h | 37
- security/apparmor/procattr.c | 332 +++++
- security/apparmor/shared.h | 46
- 24 files changed, 8123 insertions(+)
-
+Index: linux-2.6.19/security/apparmor/apparmorfs.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/apparmorfs.c
@@ -0,0 +1,432 @@
@@ -467,9 +445,11 @@
+ if (AAFS_DENTRY)
+ clear_apparmorfs();
+}
+Index: linux-2.6.19/security/apparmor/apparmor.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/apparmor.h
-@@ -0,0 +1,338 @@
+@@ -0,0 +1,356 @@
+/*
+ * Copyright (C) 1998-2005 Novell/SUSE
+ *
@@ -536,6 +516,18 @@
+#define AA_WARN(fmt, args...) printk(KERN_WARNING "AppArmor: " fmt, ##args)
+#define AA_ERROR(fmt, args...) printk(KERN_ERR "AppArmor: " fmt, ##args)
+
++
++/* apparmor logged syscall reject caching */
++enum aasyscall {
++ AA_SYSCALL_PTRACE,
++ AA_SYSCALL_SYSCTL_WRITE,
++ AA_SYSCALL_MOUNT,
++ AA_SYSCALL_UMOUNT
++};
++
++#define AA_SYSCALL_TO_MASK(X) (1 << (X))
++
++
+/* basic AppArmor data structures */
+
+struct flagval {
@@ -644,6 +636,8 @@
+ * @hat_magic: the magic token controling the ability to leave a hat
+ * @list: list this subdomain is on
+ * @task: task that the subdomain confines
++ * @cached_caps: caps that have previously generated log entries
++ * @cached_syscalls: mediated syscalls that have previously been logged
+ *
+ * Contains the tasks current active profile (which could change due to
+ * change_hat). Plus the hat_magic needed during change_hat.
@@ -656,6 +650,9 @@
+ u32 hat_magic; /* used with change_hat */
+ struct list_head list; /* list of subdomains */
+ struct task_struct *task;
++
++ kernel_cap_t cached_caps;
++ unsigned int cached_syscalls;
+};
+
+typedef int (*aa_iter) (struct subdomain *, void *);
@@ -748,7 +745,7 @@
+extern int aa_audit_message(struct aaprofile *active, gfp_t gfp, int,
+ const char *, ...);
+extern int aa_audit_syscallreject(struct aaprofile *active, gfp_t gfp,
-+ const char *);
++ enum aasyscall call);
+extern int aa_audit(struct aaprofile *active, const struct aa_audit *);
+extern char *aa_get_name(struct dentry *dentry, struct vfsmount *mnt);
+
@@ -806,11 +803,14 @@
+
+/* capabilities.c */
+extern const char *capability_to_name(unsigned int cap);
++extern const char *syscall_to_name(enum aasyscall call);
+
+#endif /* __APPARMOR_H */
+Index: linux-2.6.19/security/apparmor/capabilities.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/capabilities.c
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2005 Novell/SUSE
+ *
@@ -853,7 +853,9 @@
+ "sys_time",
+ "sys_tty_config",
+ "mknod",
-+ "lease"
++ "lease",
++ "audit_write",
++ "audit_control"
+};
+
+const char *capability_to_name(unsigned int cap)
@@ -865,9 +867,26 @@
+
+ return name;
+}
++
++static const char *syscall_names[] = {
++ "ptrace",
++ "sysctl (write)",
++ "mount",
++ "umount"
++};
++
++const char *syscall_to_name(enum aasyscall call)
++{
++ const char *name;
++ name = (call < (sizeof(syscall_names) / sizeof(char *))
++ ? syscall_names[call] : "invalid-syscall");
++ return name;
++}
+Index: linux-2.6.19/security/apparmor/inline.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/inline.h
-@@ -0,0 +1,335 @@
+@@ -0,0 +1,393 @@
+/*
+ * Copyright (C) 2005 Novell/SUSE
+ *
@@ -985,6 +1004,62 @@
+}
+
+/**
++ * cap_is_cached - check if @cap access has already been logged for current
++ * @cap: capability to test if cached
++ */
++static inline int cap_is_cached(int cap)
++{
++ struct subdomain *sd = AA_SUBDOMAIN(current->security);
++ return cap_raised(sd->cached_caps, cap);
++}
++
++/**
++ * add_to_cached_caps - add a capability to the tasks logged capabilities cache
++ * @cap: the capability to add
++ */
++static inline void add_to_cached_caps(int cap)
++{
++ struct subdomain *sd = AA_SUBDOMAIN(current->security);
++ sd->cached_caps = cap_combine(sd->cached_caps, CAP_TO_MASK(cap));
++}
++
++/**
++ * clear_cached_caps - clear the tasks logged capabilities cache
++ */
++static inline void clear_cached_caps(struct subdomain *sd)
++{
++ sd->cached_caps = CAP_EMPTY_SET;
++}
++
++/**
++ * syscall_is_cached - check if @call access has already been logged
++ * @call: syscall to test if cached
++ */
++static inline int syscall_is_cached(enum aasyscall call)
++{
++ struct subdomain *sd = AA_SUBDOMAIN(current->security);
++ return sd->cached_syscalls & AA_SYSCALL_TO_MASK(call);
++}
++
++/**
++ * add_to_cached_syscalls - add a syscall to the tasks logged syscalls cache
++ * @call: the syscall to add
++ */
++static inline void add_to_cached_syscalls(enum aasyscall call)
++{
++ struct subdomain *sd = AA_SUBDOMAIN(current->security);
++ sd->cached_syscalls |= AA_SYSCALL_TO_MASK(call);
++}
++
++/**
++ * clear_cached_syscalls - clear the tasks logged syscalls cache
++ */
++static inline void clear_cached_syscalls(struct subdomain *sd)
++{
++ sd->cached_syscalls = 0;
++}
++
++/**
+ * aa_switch - change subdomain to use a new profile
+ * @sd: subdomain to switch the active profile on
+ * @newactive: new active profile
@@ -1002,6 +1077,8 @@
+
+ /* noop if NULL */
+ rcu_assign_pointer(sd->active, get_aaprofile(newactive));
++ clear_cached_caps(sd);
++ clear_cached_syscalls(sd);
+ put_aaprofile(oldactive);
+}
+
@@ -1203,6 +1280,8 @@
+}
+
+#endif /* __INLINE_H__ */
+Index: linux-2.6.19/security/apparmor/Kbuild
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/Kbuild
@@ -0,0 +1,10 @@
@@ -1216,6 +1295,8 @@
+ module_interface.o
+
+obj-$(CONFIG_SECURITY_APPARMOR) += match/
+Index: linux-2.6.19/security/apparmor/Kconfig
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/Kconfig
@@ -0,0 +1,9 @@
@@ -1228,6 +1309,8 @@
+ distribution) and further information may be found at
+ http://forge.novell.com/modules/xfmod/project/?apparmor
+ If you are unsure how to answer this question, answer N.
+Index: linux-2.6.19/security/apparmor/list.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/list.c
@@ -0,0 +1,268 @@
@@ -1499,9 +1582,11 @@
+ .stop = p_stop,
+ .show = seq_show_profile,
+};
+Index: linux-2.6.19/security/apparmor/lsm.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/lsm.c
-@@ -0,0 +1,899 @@
+@@ -0,0 +1,900 @@
+/*
+ * Copyright (C) 2002-2005 Novell/SUSE
+ *
@@ -1596,10 +1681,9 @@
+
+ active = get_task_active_aaprofile(parent);
+
-+ if (!error && active) {
-+ error = aa_audit_syscallreject(active, GFP_KERNEL, "ptrace");
-+ WARN_ON(error != -EPERM);
-+ }
++ if (!error && active)
++ error = aa_audit_syscallreject(active, GFP_KERNEL,
++ AA_SYSCALL_PTRACE);
+
+ put_aaprofile(active);
+
@@ -1661,7 +1745,7 @@
+
+ if ((op & 002) && active && !capable(CAP_SYS_ADMIN)) {
+ error = aa_audit_syscallreject(active, GFP_KERNEL,
-+ "sysctl (write)");
++ AA_SYSCALL_SYSCTL_WRITE);
+ WARN_ON(error != -EPERM);
+ }
+
@@ -1724,7 +1808,8 @@
+ active = get_active_aaprofile();
+
+ if (active) {
-+ error = aa_audit_syscallreject(active, GFP_KERNEL, "mount");
++ error = aa_audit_syscallreject(active, GFP_KERNEL,
++ AA_SYSCALL_MOUNT);
+ WARN_ON(error != -EPERM);
+ }
+
@@ -1741,7 +1826,8 @@
+ active = get_active_aaprofile();
+
+ if (active) {
-+ error = aa_audit_syscallreject(active, GFP_ATOMIC, "umount");
++ error = aa_audit_syscallreject(active, GFP_ATOMIC,
++ AA_SYSCALL_UMOUNT);
+ WARN_ON(error != -EPERM);
+ }
+
@@ -2301,7 +2387,7 @@
+{
+ int error;
+ const char *complainmsg = ": complainmode enabled";
-+ return -EBUSY;
++
+ if ((error = create_apparmorfs())) {
+ AA_ERROR("Unable to activate AppArmor filesystem\n");
+ goto createfs_out;
@@ -2401,9 +2487,11 @@
+MODULE_DESCRIPTION("AppArmor process confinement");
+MODULE_AUTHOR("Tony Jones ");
+MODULE_LICENSE("GPL");
+Index: linux-2.6.19/security/apparmor/main.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/main.c
-@@ -0,0 +1,1681 @@
+@@ -0,0 +1,1704 @@
+/*
+ * Copyright (C) 2002-2005 Novell/SUSE
+ *
@@ -2701,8 +2789,7 @@
+ * Currently we only allow access if opened O_WRONLY
+ */
+ if (mask == MAY_WRITE && strncmp(PROCPFX, name, PROCLEN) == 0 &&
-+ (!list_empty(&BASE_PROFILE(active)->sub) ||
-+ PROFILE_COMPLAIN(active)) && aa_taskattr_access(name + PROCLEN))
++ aa_taskattr_access(name + PROCLEN))
+ goto done;
+
+ mode = 0;
@@ -2953,22 +3040,28 @@
+/**
+ * aa_audit_syscallreject - Log a syscall rejection to the audit subsystem
+ * @active: profile to check against
-+ * @msg: string describing syscall being rejected
+ * @gfp: memory allocation flags
++ * @call: aa syscall cache bit number
+ */
+int aa_audit_syscallreject(struct aaprofile *active, gfp_t gfp,
-+ const char *msg)
++ enum aasyscall call)
+{
+ struct aa_audit sa;
++ int error = -EPERM;
+
-+ sa.type = AA_AUDITTYPE_SYSCALL;
-+ sa.name = msg;
-+ sa.flags = 0;
-+ sa.gfp_mask = gfp;
-+ sa.error_code = 0;
-+ sa.result = 0; /* failure */
-+
-+ return aa_audit(active, &sa);
++ if (!syscall_is_cached(call)) {
++ sa.type = AA_AUDITTYPE_SYSCALL;
++ sa.name = syscall_to_name(call);
++ sa.flags = 0;
++ sa.gfp_mask = gfp;
++ sa.error_code = 0;
++ sa.result = 0; /* failure */
++
++ error = aa_audit(active, &sa);
++ if (error == -EPERM)
++ add_to_cached_syscalls(call);
++ }
++ return error;
+}
+
+/**
@@ -3026,6 +3119,16 @@
+ logcls = complain ? "PERMITTING" : "REJECTING";
+ }
+
++ /* test if event has already been logged and cached used to log
++ * only first time event occurs.
++ */
++ if (sa->type == AA_AUDITTYPE_CAP) {
++ if (cap_is_cached(sa->ival)) {
++ opspec_error = -EPERM;
++ goto skip_logging;
++ }
++ }
++
+ /* In future extend w/ per-profile flags
+ * (flags |= sa->active->flags)
+ */
@@ -3132,7 +3235,7 @@
+ audit_log_format(ab,
+ "access to capability '%s' ",
+ capability_to_name(sa->ival));
-+
++ add_to_cached_caps(sa->ival);
+ opspec_error = -EPERM;
+ } else if (sa->type == AA_AUDITTYPE_SYSCALL) {
+ audit_log_format(ab, "access to syscall '%s' ", sa->name);
@@ -3149,6 +3252,7 @@
+
+ audit_log_end(ab);
+
++skip_logging:
+ if (complain)
+ error = 0;
+ else
@@ -4004,6 +4108,13 @@
+ goto out;
+ }
+
++ /* check to see if the confined process has any hats. */
++ if (list_empty(&BASE_PROFILE(sd->active)->sub) &&
++ !PROFILE_COMPLAIN(sd->active)) {
++ error = -ECHILD;
++ goto out;
++ }
++
+ /* Check whether current domain is parent
+ * or one of the sibling children
+ */
@@ -4085,6 +4196,8 @@
+out:
+ return error;
+}
+Index: linux-2.6.19/security/apparmor/Makefile
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/Makefile
@@ -0,0 +1,28 @@
@@ -4111,11 +4224,13 @@
+ mv match/aamatch_pcre.ko aamatch_pcre-${KERNELVER}.ko
+
+clean:
-+ rm -f *~ *.o *.ko *.mod.c .*.cmd Modules.symvers \
++ rm -f *~ *.o *.ko *.mod.c .*.cmd Module{s,}.symvers \
+ match/*~ match/*.o match/*.ko match/.*.cmd match/*.mod.c
+ rm -rf .tmp_versions
+
+
+Index: linux-2.6.19/security/apparmor/match/Kbuild
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/Kbuild
@@ -0,0 +1,6 @@
@@ -4125,6 +4240,8 @@
+obj-$(CONFIG_SECURITY_APPARMOR) += aamatch_pcre.o
+
+aamatch_pcre-y := match_pcre.o pcre_exec.o
+Index: linux-2.6.19/security/apparmor/match/Makefile
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/Makefile
@@ -0,0 +1,5 @@
@@ -4133,6 +4250,8 @@
+obj-$(CONFIG_SECURITY_APPARMOR) += aamatch_pcre.o
+
+aamatch_pcre-y := match_pcre.o pcre_exec.o
+Index: linux-2.6.19/security/apparmor/match/match_default.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/match_default.c
@@ -0,0 +1,57 @@
@@ -4193,6 +4312,8 @@
+MODULE_DESCRIPTION("AppArmor match module (aamatch) [default]");
+MODULE_AUTHOR("Tony Jones ");
+MODULE_LICENSE("GPL");
+Index: linux-2.6.19/security/apparmor/match/match.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/match.h
@@ -0,0 +1,132 @@
@@ -4328,6 +4449,8 @@
+}
+
+#endif /* __MATCH_H */
+Index: linux-2.6.19/security/apparmor/match/match_pcre.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/match_pcre.c
@@ -0,0 +1,169 @@
@@ -4500,6 +4623,8 @@
+MODULE_DESCRIPTION("AppArmor aa_match module [pcre]");
+MODULE_AUTHOR("Tony Jones ");
+MODULE_LICENSE("GPL");
+Index: linux-2.6.19/security/apparmor/match/pcre_exec.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/pcre_exec.c
@@ -0,0 +1,1945 @@
@@ -6448,6 +6573,8 @@
+}
+
+/* End of pcre.c */
+Index: linux-2.6.19/security/apparmor/match/pcre_exec.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/pcre_exec.h
@@ -0,0 +1,308 @@
@@ -6759,6 +6886,8 @@
+
+#endif // _PCRE_H
+ /* End of pcre.h */
+Index: linux-2.6.19/security/apparmor/match/pcre_tables.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/match/pcre_tables.h
@@ -0,0 +1,184 @@
@@ -6946,9 +7075,11 @@
+ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};/* 248-255 */
+
+/* End of chartables.c */
+Index: linux-2.6.19/security/apparmor/module_interface.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/module_interface.c
-@@ -0,0 +1,846 @@
+@@ -0,0 +1,845 @@
+/*
+ * Copyright (C) 1998-2005 Novell/SUSE
+ *
@@ -7385,7 +7516,6 @@
+ return entry;
+
+fail:
-+ aamatch_free(entry->extradata);
+ free_aa_entry(entry);
+ return NULL;
+}
@@ -7795,6 +7925,8 @@
+
+ kfree(profile);
+}
+Index: linux-2.6.19/security/apparmor/module_interface.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/module_interface.h
@@ -0,0 +1,37 @@
@@ -7835,6 +7967,8 @@
+};
+
+#endif /* __MODULEINTERFACE_H */
+Index: linux-2.6.19/security/apparmor/procattr.c
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/procattr.c
@@ -0,0 +1,332 @@
@@ -8170,6 +8304,8 @@
+
+ return error;
+}
+Index: linux-2.6.19/security/apparmor/shared.h
+===================================================================
--- /dev/null
+++ linux-2.6.19/security/apparmor/shared.h
@@ -0,0 +1,46 @@
@@ -8219,6 +8355,8 @@
+ AA_EXEC_PROFILE)
+
+#endif /* _SHARED_H */
+Index: linux-2.6.19/security/Kconfig
+===================================================================
--- linux-2.6.19.orig/security/Kconfig
+++ linux-2.6.19/security/Kconfig
@@ -94,6 +94,7 @@ config SECURITY_ROOTPLUG
@@ -8229,6 +8367,8 @@
endmenu
+Index: linux-2.6.19/security/Makefile
+===================================================================
--- linux-2.6.19.orig/security/Makefile
+++ linux-2.6.19/security/Makefile
@@ -4,6 +4,7 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/dynamic-kernel-command-line-common.patch new/patches.suse/dynamic-kernel-command-line-common.patch
--- old/patches.suse/dynamic-kernel-command-line-common.patch 2007-01-31 10:18:12.000000000 +0100
+++ new/patches.suse/dynamic-kernel-command-line-common.patch 2007-02-07 08:33:52.000000000 +0100
@@ -85,10 +85,8 @@
init/main.c | 29 ++++++++++++++++++++++++-----
2 files changed, 27 insertions(+), 7 deletions(-)
-Index: b/include/linux/init.h
-===================================================================
---- a/include/linux/init.h
-+++ b/include/linux/init.h
+--- linux-2.6.20.orig/include/linux/init.h
++++ linux-2.6.20/include/linux/init.h
@@ -67,7 +67,8 @@ extern initcall_t __con_initcall_start[]
extern initcall_t __security_initcall_start[], __security_initcall_end[];
@@ -108,11 +106,9 @@
void __init parse_early_param(void);
#endif /* __ASSEMBLY__ */
-Index: b/init/main.c
-===================================================================
---- a/init/main.c
-+++ b/init/main.c
-@@ -125,8 +125,12 @@ extern void time_init(void);
+--- linux-2.6.20.orig/init/main.c
++++ linux-2.6.20/init/main.c
+@@ -121,8 +121,12 @@ extern void time_init(void);
void (*late_time_init)(void);
extern void softirq_init(void);
@@ -127,7 +123,7 @@
static char *execute_command;
static char *ramdisk_execute_command;
-@@ -429,6 +433,20 @@ static void __init smp_init(void)
+@@ -405,6 +409,20 @@ static void __init smp_init(void)
#endif
/*
@@ -148,7 +144,7 @@
* We need to finalize in a non-__init function or else race conditions
* between the root thread and the init thread may cause start_kernel to
* be reaped by free_initmem before the root thread has proceeded to
-@@ -482,7 +500,7 @@ void __init parse_early_param(void)
+@@ -458,7 +476,7 @@ void __init parse_early_param(void)
return;
/* All fall through to do_early_param. */
@@ -157,7 +153,7 @@
parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
done = 1;
}
-@@ -532,6 +550,7 @@ asmlinkage void __init start_kernel(void
+@@ -508,6 +526,7 @@ asmlinkage void __init start_kernel(void
printk(KERN_NOTICE);
printk(linux_banner);
setup_arch(&command_line);
@@ -165,7 +161,7 @@
unwind_setup();
setup_per_cpu_areas();
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
-@@ -549,9 +568,9 @@ asmlinkage void __init start_kernel(void
+@@ -525,9 +544,9 @@ asmlinkage void __init start_kernel(void
preempt_disable();
build_all_zonelists();
page_alloc_init();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/dynamic-kernel-command-line-fixups.patch new/patches.suse/dynamic-kernel-command-line-fixups.patch
--- old/patches.suse/dynamic-kernel-command-line-fixups.patch 2007-01-31 10:18:12.000000000 +0100
+++ new/patches.suse/dynamic-kernel-command-line-fixups.patch 2007-02-07 08:33:52.000000000 +0100
@@ -22,10 +22,8 @@
arch/x86_64/kernel/head64.c | 2 --
6 files changed, 3 insertions(+), 12 deletions(-)
-Index: b/arch/ia64/kernel/efi.c
-===================================================================
---- a/arch/ia64/kernel/efi.c
-+++ b/arch/ia64/kernel/efi.c
+--- linux-2.6.20.orig/arch/ia64/kernel/efi.c
++++ linux-2.6.20/arch/ia64/kernel/efi.c
@@ -405,8 +405,6 @@ efi_map_pal_code (void)
ia64_srlz_i();
}
@@ -35,10 +33,8 @@
void __init
efi_init (void)
{
-Index: b/arch/ia64/kernel/sal.c
-===================================================================
---- a/arch/ia64/kernel/sal.c
-+++ b/arch/ia64/kernel/sal.c
+--- linux-2.6.20.orig/arch/ia64/kernel/sal.c
++++ linux-2.6.20/arch/ia64/kernel/sal.c
@@ -190,8 +190,6 @@ sal_desc_ap_wakeup (void *p)
}
}
@@ -48,10 +44,8 @@
static void __init
chk_nointroute_opt(void)
{
-Index: b/arch/parisc/mm/init.c
-===================================================================
---- a/arch/parisc/mm/init.c
-+++ b/arch/parisc/mm/init.c
+--- linux-2.6.20.orig/arch/parisc/mm/init.c
++++ linux-2.6.20/arch/parisc/mm/init.c
@@ -77,7 +77,6 @@ static void __init mem_limit_func(void)
{
char *cp, *end;
@@ -60,10 +54,8 @@
/* We need this before __setup() functions are called */
-Index: b/arch/um/include/user_util.h
-===================================================================
---- a/arch/um/include/user_util.h
-+++ b/arch/um/include/user_util.h
+--- linux-2.6.20.orig/arch/um/include/user_util.h
++++ linux-2.6.20/arch/um/include/user_util.h
@@ -38,8 +38,6 @@ extern unsigned long long highmem;
extern char host_info[];
@@ -73,11 +65,9 @@
extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
extern unsigned long _unprotected_end;
extern unsigned long brk_start;
-Index: b/arch/um/kernel/um_arch.c
-===================================================================
---- a/arch/um/kernel/um_arch.c
-+++ b/arch/um/kernel/um_arch.c
-@@ -45,9 +45,9 @@
+--- linux-2.6.20.orig/arch/um/kernel/um_arch.c
++++ linux-2.6.20/arch/um/kernel/um_arch.c
+@@ -44,9 +44,9 @@
#define DEFAULT_COMMAND_LINE "root=98:0"
/* Changed in linux_main and setup_arch, which run before SMP is started */
@@ -89,7 +79,7 @@
{
if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
printf("add_arg: Too many command line arguments!\n");
-@@ -332,7 +332,7 @@ EXPORT_SYMBOL(end_iomem);
+@@ -331,7 +331,7 @@ EXPORT_SYMBOL(end_iomem);
extern char __binary_start;
@@ -98,10 +88,8 @@
{
unsigned long avail, diff;
unsigned long virtmem_size, max_physmem;
-Index: b/arch/x86_64/kernel/head64.c
-===================================================================
---- a/arch/x86_64/kernel/head64.c
-+++ b/arch/x86_64/kernel/head64.c
+--- linux-2.6.20.orig/arch/x86_64/kernel/head64.c
++++ linux-2.6.20/arch/x86_64/kernel/head64.c
@@ -34,8 +34,6 @@ static void __init clear_bss(void)
#define OLD_CL_BASE_ADDR 0x90000
#define OLD_CL_OFFSET 0x90022
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/dynamic-kernel-command-line-um.patch new/patches.suse/dynamic-kernel-command-line-um.patch
--- old/patches.suse/dynamic-kernel-command-line-um.patch 2007-01-31 10:18:12.000000000 +0100
+++ new/patches.suse/dynamic-kernel-command-line-um.patch 2007-02-07 08:33:52.000000000 +0100
@@ -13,10 +13,8 @@
arch/um/kernel/um_arch.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: b/arch/um/include/user_util.h
-===================================================================
---- a/arch/um/include/user_util.h
-+++ b/arch/um/include/user_util.h
+--- linux-2.6.20.orig/arch/um/include/user_util.h
++++ linux-2.6.20/arch/um/include/user_util.h
@@ -38,7 +38,7 @@ extern unsigned long long highmem;
extern char host_info[];
@@ -26,11 +24,9 @@
extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
extern unsigned long _unprotected_end;
-Index: b/arch/um/kernel/um_arch.c
-===================================================================
---- a/arch/um/kernel/um_arch.c
-+++ b/arch/um/kernel/um_arch.c
-@@ -483,7 +483,7 @@ void __init setup_arch(char **cmdline_p)
+--- linux-2.6.20.orig/arch/um/kernel/um_arch.c
++++ linux-2.6.20/arch/um/kernel/um_arch.c
+@@ -482,7 +482,7 @@ void __init setup_arch(char **cmdline_p)
atomic_notifier_chain_register(&panic_notifier_list,
&panic_exit_notifier);
paging_init();
@@ -38,4 +34,4 @@
+ strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
setup_hostinfo();
- #if defined(CONFIG_DUMMY_CONSOLE)
+ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-common new/patches.suse/kdb-common
--- old/patches.suse/kdb-common 2007-02-01 15:08:01.000000000 +0100
+++ new/patches.suse/kdb-common 2007-02-07 08:33:52.000000000 +0100
@@ -67,10 +67,8 @@
mm/swapfile.c | 22
53 files changed, 17079 insertions(+), 8 deletions(-)
-Index: linux/Documentation/kdb/kdb.mm
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb.mm
++++ linux-2.6.20/Documentation/kdb/kdb.mm
@@ -0,0 +1,492 @@
+.TH KDB 8 "September 21, 2005"
+.hy 0
@@ -564,10 +562,8 @@
+.SH SEE ALSO
+.P
+linux/Documentation/kdb/kdb_{bp,bt,env,ll,md,ps,rd,sr,ss}.man
-Index: linux/Documentation/kdb/kdb_bp.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_bp.man
++++ linux-2.6.20/Documentation/kdb/kdb_bp.man
@@ -0,0 +1,197 @@
+.TH BD 1 "July 12, 2004"
+.SH NAME
@@ -766,10 +762,8 @@
+.TP 8
+bc *
+Clear all breakpoints
-Index: linux/Documentation/kdb/kdb_bt.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_bt.man
++++ linux-2.6.20/Documentation/kdb/kdb_bt.man
@@ -0,0 +1,228 @@
+.TH BT 1 "August 25, 2006"
+.SH NAME
@@ -999,10 +993,8 @@
+ kernel .text 0xc0100000 0xc01176c4 0xc01178e8
+ 0xc01095f8 system_call+0x34
+ kernel .text 0xc0100000 0xc01095c4 0xc01095fc
-Index: linux/Documentation/kdb/kdb_env.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_env.man
++++ linux-2.6.20/Documentation/kdb/kdb_env.man
@@ -0,0 +1,46 @@
+.TH ENV 1 "24 September 2000"
+.SH NAME
@@ -1050,10 +1042,8 @@
+set IDCOUNT=100
+Set the number of lines to display for the \fBid\fP command
+to the value \fI100\fP.
-Index: linux/Documentation/kdb/kdb_ll.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_ll.man
++++ linux-2.6.20/Documentation/kdb/kdb_ll.man
@@ -0,0 +1,134 @@
+.TH LL 1 "19 April 1999"
+.SH NAME
@@ -1189,10 +1179,8 @@
+page_prot = 0x25 avl_height = 2244 vm_offset = 0x0
+flags: READ WRITE EXEC MAYREAD MAYWRITE MAYEXEC GROWSDOWN
+kdb>
-Index: linux/Documentation/kdb/kdb_md.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_md.man
++++ linux-2.6.20/Documentation/kdb/kdb_md.man
@@ -0,0 +1,136 @@
+.TH MD 1 "August 4, 2004"
+.SH NAME
@@ -1330,10 +1318,8 @@
+md chrdev_table 15
+Display 15 lines (at 16 bytes per line) starting at address
+represented by the symbol \fIchrdev_table\fP.
-Index: linux/Documentation/kdb/kdb_ps.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_ps.man
++++ linux-2.6.20/Documentation/kdb/kdb_ps.man
@@ -0,0 +1,96 @@
+.TH PS 1 "September 14, 2004"
+.SH NAME
@@ -1431,10 +1417,8 @@
+displays all tasks.
+This is easier than remembering DRSTCZEUIM.
+
-Index: linux/Documentation/kdb/kdb_rd.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_rd.man
++++ linux-2.6.20/Documentation/kdb/kdb_rd.man
@@ -0,0 +1,170 @@
+.TH RD 1 "September 20, 2005"
+.SH NAME
@@ -1606,10 +1590,8 @@
+.TP 8
+rm %CP15CRn7CRm5Op6 0
+Same with above.
-Index: linux/Documentation/kdb/kdb_sr.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_sr.man
++++ linux-2.6.20/Documentation/kdb/kdb_sr.man
@@ -0,0 +1,68 @@
+.TH SR 1 "7 October 2002"
+.SH NAME
@@ -1679,10 +1661,8 @@
+If the sysrq handler or any of the sysrq functions have to wait for a
+lock then they will never return and kdb will appear to hang.
+Invoking sysrq code from kdb is inherently unsafe.
-Index: linux/Documentation/kdb/kdb_ss.man
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/kdb_ss.man
++++ linux-2.6.20/Documentation/kdb/kdb_ss.man
@@ -0,0 +1,109 @@
+.TH SS 1 "17 January 2002"
+.SH NAME
@@ -1793,10 +1773,8 @@
+sys_read+0x6: pushl %edi
+[0]kdb>
+
-Index: linux/Documentation/kdb/slides
-===================================================================
--- /dev/null
-+++ linux/Documentation/kdb/slides
++++ linux-2.6.20/Documentation/kdb/slides
@@ -0,0 +1,1382 @@
+#! /opt/cpg/bin/do-mgp
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3180,11 +3158,9 @@
+ [Uptodate Req Mapped]
+DIRTY page_struct index cnt flags
+LOCKED page_struct index cnt flags
-Index: linux/Makefile
-===================================================================
---- linux.orig/Makefile
-+++ linux/Makefile
-@@ -554,6 +554,7 @@ export mod_strip_cmd
+--- linux-2.6.20.orig/Makefile
++++ linux-2.6.20/Makefile
+@@ -560,6 +560,7 @@ export mod_strip_cmd
ifeq ($(KBUILD_EXTMOD),)
core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
@@ -3192,10 +3168,8 @@
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-Index: linux/drivers/char/keyboard.c
-===================================================================
---- linux.orig/drivers/char/keyboard.c
-+++ linux/drivers/char/keyboard.c
+--- linux-2.6.20.orig/drivers/char/keyboard.c
++++ linux-2.6.20/drivers/char/keyboard.c
@@ -40,6 +40,9 @@
#include
#include
@@ -3220,10 +3194,8 @@
#ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */
if (keycode == KEY_SYSRQ && (sysrq_down || (down == 1 && sysrq_alt))) {
if (!sysrq_down) {
-Index: linux/drivers/serial/8250.c
-===================================================================
---- linux.orig/drivers/serial/8250.c
-+++ linux/drivers/serial/8250.c
+--- linux-2.6.20.orig/drivers/serial/8250.c
++++ linux-2.6.20/drivers/serial/8250.c
@@ -45,6 +45,19 @@
#include
@@ -3242,9 +3214,9 @@
+static const char *kdb_serial_ptr = kdb_serial_str;
+#endif /* CONFIG_KDB */
- /*
- * Configuration:
-@@ -1184,6 +1197,20 @@ receive_chars(struct uart_8250_port *up,
+ #ifndef NO_PC_LEGACY_SERIAL_8250
+ #define do_not_probe_pc_legacy_8250 (0)
+@@ -1188,6 +1201,20 @@ receive_chars(struct uart_8250_port *up,
do {
ch = serial_inp(up, UART_RX);
@@ -3265,7 +3237,7 @@
flag = TTY_NORMAL;
up->port.icount.rx++;
-@@ -2267,7 +2294,7 @@ serial8250_console_write(struct console
+@@ -2271,7 +2298,7 @@ serial8250_console_write(struct console
if (up->port.sysrq) {
/* serial8250_handle_port() already took the lock */
locked = 0;
@@ -3274,7 +3246,7 @@
locked = spin_trylock(&up->port.lock);
} else
spin_lock(&up->port.lock);
-@@ -2315,6 +2342,30 @@ static int __init serial8250_console_set
+@@ -2319,6 +2346,30 @@ static int __init serial8250_console_set
if (!port->iobase && !port->membase)
return -ENODEV;
@@ -3305,10 +3277,8 @@
if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow);
-Index: linux/drivers/serial/8250_early.c
-===================================================================
---- linux.orig/drivers/serial/8250_early.c
-+++ linux/drivers/serial/8250_early.c
+--- linux-2.6.20.orig/drivers/serial/8250_early.c
++++ linux-2.6.20/drivers/serial/8250_early.c
@@ -35,6 +35,13 @@
#include
#include
@@ -3364,10 +3334,8 @@
return err;
return early_uart_console_init();
}
-Index: linux/drivers/serial/sn_console.c
-===================================================================
---- linux.orig/drivers/serial/sn_console.c
-+++ linux/drivers/serial/sn_console.c
+--- linux-2.6.20.orig/drivers/serial/sn_console.c
++++ linux-2.6.20/drivers/serial/sn_console.c
@@ -48,6 +48,22 @@
#include /* for mdelay */
#include
@@ -3466,10 +3434,8 @@
+ return 0;
+}
+#endif /* CONFIG_KDB */
-Index: linux/drivers/usb/host/ohci-hcd.c
-===================================================================
---- linux.orig/drivers/usb/host/ohci-hcd.c
-+++ linux/drivers/usb/host/ohci-hcd.c
+--- linux-2.6.20.orig/drivers/usb/host/ohci-hcd.c
++++ linux-2.6.20/drivers/usb/host/ohci-hcd.c
@@ -847,6 +847,53 @@ static int ohci_restart (struct ohci_hcd
/*-------------------------------------------------------------------------*/
@@ -3524,10 +3490,8 @@
#define DRIVER_INFO DRIVER_VERSION " " DRIVER_DESC
MODULE_AUTHOR (DRIVER_AUTHOR);
-Index: linux/drivers/usb/host/ohci-pci.c
-===================================================================
---- linux.orig/drivers/usb/host/ohci-pci.c
-+++ linux/drivers/usb/host/ohci-pci.c
+--- linux-2.6.20.orig/drivers/usb/host/ohci-pci.c
++++ linux-2.6.20/drivers/usb/host/ohci-pci.c
@@ -18,6 +18,10 @@
#error "This file is PCI bus glue. CONFIG_PCI must be defined."
#endif
@@ -3551,10 +3515,8 @@
return 0;
}
-Index: linux/drivers/usb/host/ohci-q.c
-===================================================================
---- linux.orig/drivers/usb/host/ohci-q.c
-+++ linux/drivers/usb/host/ohci-q.c
+--- linux-2.6.20.orig/drivers/usb/host/ohci-q.c
++++ linux-2.6.20/drivers/usb/host/ohci-q.c
@@ -1115,3 +1115,65 @@ dl_done_list (struct ohci_hcd *ohci)
td = td_next;
}
@@ -3621,10 +3583,8 @@
+}
+
+#endif /* CONFIG_KDB_USB */
-Index: linux/drivers/usb/input/hid-core.c
-===================================================================
---- linux.orig/drivers/usb/input/hid-core.c
-+++ linux/drivers/usb/input/hid-core.c
+--- linux-2.6.20.orig/drivers/usb/input/hid-core.c
++++ linux-2.6.20/drivers/usb/input/hid-core.c
@@ -46,6 +46,10 @@
#define DRIVER_DESC "USB HID core driver"
#define DRIVER_LICENSE "GPL"
@@ -3636,7 +3596,7 @@
static char *hid_types[] = {"Device", "Pointer", "Mouse", "Device", "Joystick",
"Gamepad", "Keyboard", "Keypad", "Multi-Axis Controller"};
/*
-@@ -1263,6 +1267,12 @@ static void hid_disconnect(struct usb_in
+@@ -1269,6 +1273,12 @@ static void hid_disconnect(struct usb_in
usbhid = hid->driver_data;
@@ -3649,7 +3609,7 @@
spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
usb_set_intfdata(intf, NULL);
spin_unlock_irq(&usbhid->inlock);
-@@ -1346,6 +1356,16 @@ static int hid_probe(struct usb_interfac
+@@ -1352,6 +1362,16 @@ static int hid_probe(struct usb_interfac
printk(": USB HID v%x.%02x %s [%s] on %s\n",
hid->version >> 8, hid->version & 0xff, c, hid->name, path);
@@ -3666,10 +3626,8 @@
return 0;
}
-Index: linux/drivers/usb/input/usbkbd.c
-===================================================================
---- linux.orig/drivers/usb/input/usbkbd.c
-+++ linux/drivers/usb/input/usbkbd.c
+--- linux-2.6.20.orig/drivers/usb/input/usbkbd.c
++++ linux-2.6.20/drivers/usb/input/usbkbd.c
@@ -31,6 +31,9 @@
#include
#include
@@ -3706,10 +3664,8 @@
if (kbd) {
usb_kill_urb(kbd->irq);
input_unregister_device(kbd->dev);
-Index: linux/fs/proc/mmu.c
-===================================================================
---- linux.orig/fs/proc/mmu.c
-+++ linux/fs/proc/mmu.c
+--- linux-2.6.20.orig/fs/proc/mmu.c
++++ linux-2.6.20/fs/proc/mmu.c
@@ -31,11 +31,21 @@
#include
#include "internal.h"
@@ -3751,10 +3707,8 @@
+ read_unlock(&vmlist_lock);
}
}
-Index: linux/fs/proc/proc_misc.c
-===================================================================
---- linux.orig/fs/proc/proc_misc.c
-+++ linux/fs/proc/proc_misc.c
+--- linux-2.6.20.orig/fs/proc/proc_misc.c
++++ linux-2.6.20/fs/proc/proc_misc.c
@@ -221,6 +221,125 @@ static int meminfo_read_proc(char *page,
#undef K
}
@@ -3881,10 +3835,8 @@
extern struct seq_operations fragmentation_op;
static int fragmentation_open(struct inode *inode, struct file *file)
{
-Index: linux/include/linux/console.h
-===================================================================
---- linux.orig/include/linux/console.h
-+++ linux/include/linux/console.h
+--- linux-2.6.20.orig/include/linux/console.h
++++ linux-2.6.20/include/linux/console.h
@@ -134,7 +134,12 @@ void prom_con_init(void);
/* Some debug stub to catch some of the obvious races in the VT code */
@@ -3898,10 +3850,8 @@
#else
#define WARN_CONSOLE_UNLOCKED()
#endif
-Index: linux/include/linux/dis-asm.h
-===================================================================
--- /dev/null
-+++ linux/include/linux/dis-asm.h
++++ linux-2.6.20/include/linux/dis-asm.h
@@ -0,0 +1,347 @@
+/* Interface between the opcode library and its callers.
+
@@ -4250,10 +4200,8 @@
+#endif
+
+#endif /* ! defined (DIS_ASM_H) */
-Index: linux/include/linux/kdb.h
-===================================================================
--- /dev/null
-+++ linux/include/linux/kdb.h
++++ linux-2.6.20/include/linux/kdb.h
@@ -0,0 +1,164 @@
+#ifndef _KDB_H
+#define _KDB_H
@@ -4419,10 +4367,8 @@
+extern const char kdb_serial_str[];
+
+#endif /* !_KDB_H */
-Index: linux/include/linux/kdbprivate.h
-===================================================================
--- /dev/null
-+++ linux/include/linux/kdbprivate.h
++++ linux-2.6.20/include/linux/kdbprivate.h
@@ -0,0 +1,493 @@
+#ifndef _KDBPRIVATE_H
+#define _KDBPRIVATE_H
@@ -4917,11 +4863,9 @@
+extern void kdba_cpu_up(void);
+
+#endif /* !_KDBPRIVATE_H */
-Index: linux/include/linux/sysctl.h
-===================================================================
---- linux.orig/include/linux/sysctl.h
-+++ linux/include/linux/sysctl.h
-@@ -160,6 +160,7 @@ enum
+--- linux-2.6.20.orig/include/linux/sysctl.h
++++ linux-2.6.20/include/linux/sysctl.h
+@@ -161,6 +161,7 @@ enum
KERN_NMI_WATCHDOG=75, /* int: enable/disable nmi watchdog */
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
KERN_UNSUPPORTED, /* int: allow loading of unsupported modules */
@@ -4929,10 +4873,8 @@
};
-Index: linux/init/main.c
-===================================================================
---- linux.orig/init/main.c
-+++ linux/init/main.c
+--- linux-2.6.20.orig/init/main.c
++++ linux-2.6.20/init/main.c
@@ -63,6 +63,10 @@
#include
#endif
@@ -4944,7 +4886,7 @@
/*
* This is one of the first .c files built. Error out early if we have compiler
* trouble.
-@@ -182,6 +186,26 @@ static const char *panic_later, *panic_p
+@@ -186,6 +190,26 @@ static const char *panic_later, *panic_p
extern struct obs_kernel_param __setup_start[], __setup_end[];
@@ -4971,7 +4913,7 @@
static int __init obsolete_checksetup(char *line)
{
struct obs_kernel_param *p;
-@@ -590,6 +614,14 @@ asmlinkage void __init start_kernel(void
+@@ -609,6 +633,14 @@ asmlinkage void __init start_kernel(void
pgtable_cache_init();
prio_tree_init();
anon_vma_init();
@@ -4986,10 +4928,8 @@
#ifdef CONFIG_X86
if (efi_enabled)
efi_enter_virtual_mode();
-Index: linux/kdb/ChangeLog
-===================================================================
--- /dev/null
-+++ linux/kdb/ChangeLog
++++ linux-2.6.20/kdb/ChangeLog
@@ -0,0 +1,1561 @@
+2007-02-01 Keith Owens
+
@@ -6552,10 +6492,8 @@
+ * include/linux/kdbprivate.h: add kdb_initial_cpu.
+
+ * include/linux/kdb.h: add kdb_on, bump version to kdb v1.4.
-Index: linux/kdb/Makefile
-===================================================================
--- /dev/null
-+++ linux/kdb/Makefile
++++ linux-2.6.20/kdb/Makefile
@@ -0,0 +1,28 @@
+#
+# This file is subject to the terms and conditions of the GNU General Public
@@ -6585,10 +6523,8 @@
+
+$(obj)/gen-kdb_cmds.c: $(src)/kdb_cmds $(wildcard $(TOPDIR)/arch/$(ARCH)/kdb/kdb_cmds) $(src)/Makefile
+ $(call cmd,gen-kdb)
-Index: linux/kdb/kdb_bp.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdb_bp.c
++++ linux-2.6.20/kdb/kdb_bp.c
@@ -0,0 +1,619 @@
+/*
+ * Kernel Debugger Architecture Independent Breakpoint Handler
@@ -7209,10 +7145,8 @@
+ */
+ kdba_initbp();
+}
-Index: linux/kdb/kdb_bt.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdb_bt.c
++++ linux-2.6.20/kdb/kdb_bt.c
@@ -0,0 +1,180 @@
+/*
+ * Kernel Debugger Architecture Independent Stack Traceback
@@ -7394,10 +7328,8 @@
+ /* NOTREACHED */
+ return 0;
+}
-Index: linux/kdb/kdb_cmds
-===================================================================
--- /dev/null
-+++ linux/kdb/kdb_cmds
++++ linux-2.6.20/kdb/kdb_cmds
@@ -0,0 +1,32 @@
+# Initial commands for kdb, alter to suit your needs.
+# These commands are executed in kdb_init() context, no SMP, no
@@ -7431,10 +7363,8 @@
+ -archkdbcommon
+ -bta
+endefcmd
-Index: linux/kdb/kdb_id.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdb_id.c
++++ linux-2.6.20/kdb/kdb_id.c
@@ -0,0 +1,233 @@
+/*
+ * Kernel Debugger Architecture Independent Instruction Disassembly
@@ -7669,10 +7599,8 @@
+
+ kdba_id_init(&kdb_di);
+}
-Index: linux/kdb/kdb_io.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdb_io.c
++++ linux-2.6.20/kdb/kdb_io.c
@@ -0,0 +1,663 @@
+/*
+ * Kernel Debugger Architecture Independent Console I/O handler
@@ -8337,10 +8265,8 @@
+}
+
+EXPORT_SYMBOL(kdb_read);
-Index: linux/kdb/kdbmain.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdbmain.c
++++ linux-2.6.20/kdb/kdbmain.c
@@ -0,0 +1,4021 @@
+/*
+ * Kernel Debugger Architecture Independent Main Code
@@ -12363,10 +12289,8 @@
+EXPORT_SYMBOL(kdb_printf);
+EXPORT_SYMBOL(kdb_symbol_print);
+EXPORT_SYMBOL(kdb_running_process);
-Index: linux/kdb/kdbsupport.c
-===================================================================
--- /dev/null
-+++ linux/kdb/kdbsupport.c
++++ linux-2.6.20/kdb/kdbsupport.c
@@ -0,0 +1,1064 @@
+/*
+ * Kernel Debugger Architecture Independent Support Functions
@@ -13432,10 +13356,8 @@
+ BUG_ON(kdb_flags_index <= 0);
+ kdb_flags = kdb_flags_stack[--kdb_flags_index];
+}
-Index: linux/kdb/modules/Makefile
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/Makefile
++++ linux-2.6.20/kdb/modules/Makefile
@@ -0,0 +1,14 @@
+#
+# This file is subject to the terms and conditions of the GNU General Public
@@ -13451,10 +13373,8 @@
+endif
+obj-$(CONFIG_KDB_MODULES_XP) += kdbm_xpc.o
+CFLAGS_kdbm_vm.o += -I $(srctree)/drivers/scsi
-Index: linux/kdb/modules/kdbm_pg.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_pg.c
++++ linux-2.6.20/kdb/modules/kdbm_pg.c
@@ -0,0 +1,647 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14103,10 +14023,8 @@
+
+module_init(kdbm_pg_init)
+module_exit(kdbm_pg_exit)
-Index: linux/kdb/modules/kdbm_sched.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_sched.c
++++ linux-2.6.20/kdb/modules/kdbm_sched.c
@@ -0,0 +1,57 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14165,10 +14083,8 @@
+
+module_init(kdbm_sched_init)
+module_exit(kdbm_sched_exit)
-Index: linux/kdb/modules/kdbm_task.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_task.c
++++ linux-2.6.20/kdb/modules/kdbm_task.c
@@ -0,0 +1,199 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -14369,10 +14285,8 @@
+
+kdb_module_init(kdbm_task_init)
+kdb_module_exit(kdbm_task_exit)
-Index: linux/kdb/modules/kdbm_vm.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_vm.c
++++ linux-2.6.20/kdb/modules/kdbm_vm.c
@@ -0,0 +1,841 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -15215,10 +15129,8 @@
+
+module_init(kdbm_vm_init)
+module_exit(kdbm_vm_exit)
-Index: linux/kdb/modules/kdbm_x86.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_x86.c
++++ linux-2.6.20/kdb/modules/kdbm_x86.c
@@ -0,0 +1,1037 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -16257,10 +16169,8 @@
+
+module_init(kdbm_x86_init)
+module_exit(kdbm_x86_exit)
-Index: linux/kdb/modules/kdbm_xpc.c
-===================================================================
--- /dev/null
-+++ linux/kdb/modules/kdbm_xpc.c
++++ linux-2.6.20/kdb/modules/kdbm_xpc.c
@@ -0,0 +1,1105 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -17367,10 +17277,8 @@
+module_init(kdbm_xpc_register);
+module_exit(kdbm_xpc_unregister);
+
-Index: linux/kernel/exit.c
-===================================================================
---- linux.orig/kernel/exit.c
-+++ linux/kernel/exit.c
+--- linux-2.6.20.orig/kernel/exit.c
++++ linux-2.6.20/kernel/exit.c
@@ -4,6 +4,9 @@
* Copyright (C) 1991, 1992 Linus Torvalds
*/
@@ -17381,10 +17289,8 @@
#include
#include
#include
-Index: linux/kernel/kallsyms.c
-===================================================================
---- linux.orig/kernel/kallsyms.c
-+++ linux/kernel/kallsyms.c
+--- linux-2.6.20.orig/kernel/kallsyms.c
++++ linux-2.6.20/kernel/kallsyms.c
@@ -452,3 +452,25 @@ static int __init kallsyms_init(void)
__initcall(kallsyms_init);
@@ -17411,11 +17317,9 @@
+ }
+}
+#endif /* CONFIG_KDB */
-Index: linux/kernel/module.c
-===================================================================
---- linux.orig/kernel/module.c
-+++ linux/kernel/module.c
-@@ -2100,24 +2100,37 @@ const char *module_address_lookup(unsign
+--- linux-2.6.20.orig/kernel/module.c
++++ linux-2.6.20/kernel/module.c
+@@ -2136,24 +2136,37 @@ const char *module_address_lookup(unsign
return NULL;
}
@@ -17456,13 +17360,11 @@
return NULL;
}
-Index: linux/kernel/printk.c
-===================================================================
---- linux.orig/kernel/printk.c
-+++ linux/kernel/printk.c
-@@ -318,6 +318,20 @@ asmlinkage long sys_syslog(int type, cha
- return do_syslog(type, buf, len);
+--- linux-2.6.20.orig/kernel/printk.c
++++ linux-2.6.20/kernel/printk.c
+@@ -333,6 +333,20 @@ void debugger_syslog_data(char *syslog_d
}
+ #endif /* CONFIG_DEBUG_KERNEL */
+#ifdef CONFIG_KDB
+/* kdb dmesg command needs access to the syslog buffer. do_syslog() uses locks
@@ -17481,10 +17383,8 @@
/*
* Call the console drivers on a range of log_buf
*/
-Index: linux/kernel/sched.c
-===================================================================
---- linux.orig/kernel/sched.c
-+++ linux/kernel/sched.c
+--- linux-2.6.20.orig/kernel/sched.c
++++ linux-2.6.20/kernel/sched.c
@@ -7014,7 +7014,7 @@ void normalize_rt_tasks(void)
#endif /* CONFIG_MAGIC_SYSRQ */
@@ -17575,10 +17475,8 @@
+EXPORT_SYMBOL(kdb_runqueue);
+
+#endif /* CONFIG_KDB */
-Index: linux/kernel/signal.c
-===================================================================
---- linux.orig/kernel/signal.c
-+++ linux/kernel/signal.c
+--- linux-2.6.20.orig/kernel/signal.c
++++ linux-2.6.20/kernel/signal.c
@@ -2641,3 +2641,52 @@ void __init signals_init(void)
__alignof__(struct sigqueue),
SLAB_PANIC, NULL, NULL);
@@ -17632,10 +17530,8 @@
+ kdb_printf("Signal %d is sent to process %d.\n", sig, t->pid);
+}
+#endif /* CONFIG_KDB */
-Index: linux/mm/hugetlb.c
-===================================================================
---- linux.orig/mm/hugetlb.c
-+++ linux/mm/hugetlb.c
+--- linux-2.6.20.orig/mm/hugetlb.c
++++ linux-2.6.20/mm/hugetlb.c
@@ -245,6 +245,25 @@ int hugetlb_sysctl_handler(struct ctl_ta
}
#endif /* CONFIG_SYSCTL */
@@ -17662,10 +17558,8 @@
int hugetlb_report_meminfo(char *buf)
{
return sprintf(buf,
-Index: linux/mm/swapfile.c
-===================================================================
---- linux.orig/mm/swapfile.c
-+++ linux/mm/swapfile.c
+--- linux-2.6.20.orig/mm/swapfile.c
++++ linux-2.6.20/mm/swapfile.c
@@ -13,6 +13,10 @@
#include
#include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-touchpad-quirk.patch new/patches.suse/ppc-powerbook-touchpad-quirk.patch
--- old/patches.suse/ppc-powerbook-touchpad-quirk.patch 2007-01-26 08:58:59.000000000 +0100
+++ new/patches.suse/ppc-powerbook-touchpad-quirk.patch 2007-02-07 08:33:52.000000000 +0100
@@ -17,9 +17,9 @@
include/linux/hid.h | 1 +
2 files changed, 20 insertions(+), 13 deletions(-)
---- linux-2.6.19.orig/drivers/usb/input/hid-core.c
-+++ linux-2.6.19/drivers/usb/input/hid-core.c
-@@ -777,6 +777,7 @@ void usbhid_init_reports(struct hid_devi
+--- linux-2.6.20.orig/drivers/usb/input/hid-core.c
++++ linux-2.6.20/drivers/usb/input/hid-core.c
+@@ -770,6 +770,7 @@ void usbhid_init_reports(struct hid_devi
#define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
@@ -27,7 +27,7 @@
#define USB_VENDOR_ID_CHERRY 0x046a
#define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023
-@@ -954,19 +955,19 @@ static const struct hid_blacklist {
+@@ -946,19 +947,19 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_CYMOTION },
@@ -60,7 +60,7 @@
{ USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
-@@ -1072,6 +1073,11 @@ static struct hid_device *usb_hid_config
+@@ -1064,6 +1065,11 @@ static struct hid_device *usb_hid_config
if (quirks & HID_QUIRK_IGNORE)
return NULL;
@@ -72,8 +72,8 @@
if (usb_get_extra_descriptor(interface, HID_DT_HID, &hdesc) &&
(!interface->desc.bNumEndpoints ||
usb_get_extra_descriptor(&interface->endpoint[0], HID_DT_HID, &hdesc))) {
---- linux-2.6.19.orig/include/linux/hid.h
-+++ linux-2.6.19/include/linux/hid.h
+--- linux-2.6.20.orig/include/linux/hid.h
++++ linux-2.6.20/include/linux/hid.h
@@ -264,6 +264,7 @@ struct hid_item {
#define HID_QUIRK_INVERT_HWHEEL 0x00004000
#define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00008000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/ppc-powerbook-usb-fn-key-default.patch new/patches.suse/ppc-powerbook-usb-fn-key-default.patch
--- old/patches.suse/ppc-powerbook-usb-fn-key-default.patch 2007-02-01 15:08:02.000000000 +0100
+++ new/patches.suse/ppc-powerbook-usb-fn-key-default.patch 2007-02-07 08:33:52.000000000 +0100
@@ -18,9 +18,9 @@
drivers/hid/hid-input.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
---- linux-2.6.19.orig/drivers/hid/hid-input.c
-+++ linux-2.6.19/drivers/hid/hid-input.c
-@@ -56,7 +56,7 @@ static unsigned int hid_mousepoll_interv
+--- linux-2.6.20.orig/drivers/hid/hid-input.c
++++ linux-2.6.20/drivers/hid/hid-input.c
+@@ -35,7 +35,7 @@
#include
++++++ patches.uml.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.uml/uml-kconfig new/patches.uml/uml-kconfig
--- old/patches.uml/uml-kconfig 2007-01-13 11:00:23.000000000 +0100
+++ new/patches.uml/uml-kconfig 2007-02-07 08:33:52.000000000 +0100
@@ -18,8 +18,8 @@
include/linux/console.h | 1 +
11 files changed, 28 insertions(+), 7 deletions(-)
---- linux-2.6.19.orig/drivers/input/keyboard/Kconfig
-+++ linux-2.6.19/drivers/input/keyboard/Kconfig
+--- linux-2.6.20.orig/drivers/input/keyboard/Kconfig
++++ linux-2.6.20/drivers/input/keyboard/Kconfig
@@ -10,7 +10,7 @@ menuconfig INPUT_KEYBOARD
If unsure, say Y.
@@ -29,8 +29,8 @@
config KEYBOARD_ATKBD
tristate "AT keyboard" if EMBEDDED || !X86_PC
---- linux-2.6.19.orig/drivers/input/mouse/Kconfig
-+++ linux-2.6.19/drivers/input/mouse/Kconfig
+--- linux-2.6.20.orig/drivers/input/mouse/Kconfig
++++ linux-2.6.20/drivers/input/mouse/Kconfig
@@ -10,7 +10,7 @@ menuconfig INPUT_MOUSE
If unsure, say Y.
@@ -40,8 +40,8 @@
config MOUSE_PS2
tristate "PS/2 mouse"
---- linux-2.6.19.orig/drivers/input/serio/Kconfig
-+++ linux-2.6.19/drivers/input/serio/Kconfig
+--- linux-2.6.20.orig/drivers/input/serio/Kconfig
++++ linux-2.6.20/drivers/input/serio/Kconfig
@@ -21,7 +21,7 @@ if SERIO
config SERIO_I8042
tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
@@ -51,8 +51,8 @@
---help---
i8042 is the chip over which the standard AT keyboard and PS/2
mouse are connected to the computer. If you use these devices,
---- linux-2.6.19.orig/drivers/char/Kconfig
-+++ linux-2.6.19/drivers/char/Kconfig
+--- linux-2.6.20.orig/drivers/char/Kconfig
++++ linux-2.6.20/drivers/char/Kconfig
@@ -59,7 +59,7 @@ config VT_CONSOLE
config HW_CONSOLE
@@ -70,8 +70,8 @@
---help---
Say Y here if you have any non-standard serial boards -- boards
which aren't supported using the standard "dumb" serial driver.
---- linux-2.6.19.orig/drivers/input/touchscreen/Kconfig
-+++ linux-2.6.19/drivers/input/touchscreen/Kconfig
+--- linux-2.6.20.orig/drivers/input/touchscreen/Kconfig
++++ linux-2.6.20/drivers/input/touchscreen/Kconfig
@@ -9,7 +9,7 @@ menuconfig INPUT_TOUCHSCREEN
If unsure, say Y.
@@ -81,8 +81,8 @@
config TOUCHSCREEN_ADS7846
tristate "ADS 7846 based touchscreens"
---- linux-2.6.19.orig/arch/um/Kconfig
-+++ linux-2.6.19/arch/um/Kconfig
+--- linux-2.6.20.orig/arch/um/Kconfig
++++ linux-2.6.20/arch/um/Kconfig
@@ -309,6 +309,12 @@ source "drivers/net/Kconfig"
source "drivers/connector/Kconfig"
@@ -96,8 +96,8 @@
source "fs/Kconfig"
source "security/Kconfig"
---- linux-2.6.19.orig/arch/um/kernel/um_arch.c
-+++ linux-2.6.19/arch/um/kernel/um_arch.c
+--- linux-2.6.20.orig/arch/um/kernel/um_arch.c
++++ linux-2.6.20/arch/um/kernel/um_arch.c
@@ -17,6 +17,7 @@
#include "linux/seq_file.h"
#include "linux/delay.h"
@@ -107,7 +107,7 @@
#include "asm/pgtable.h"
#include "asm/ptrace.h"
@@ -485,6 +486,9 @@ void __init setup_arch(char **cmdline_p)
- strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
+ strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
*cmdline_p = command_line;
setup_hostinfo();
+#if defined(CONFIG_DUMMY_CONSOLE)
@@ -116,8 +116,8 @@
}
void __init check_bugs(void)
---- linux-2.6.19.orig/drivers/char/tty_io.c
-+++ linux-2.6.19/drivers/char/tty_io.c
+--- linux-2.6.20.orig/drivers/char/tty_io.c
++++ linux-2.6.20/drivers/char/tty_io.c
@@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -153,8 +153,8 @@
#endif
return 0;
}
---- linux-2.6.19.orig/include/linux/console.h
-+++ linux-2.6.19/include/linux/console.h
+--- linux-2.6.20.orig/include/linux/console.h
++++ linux-2.6.20/include/linux/console.h
@@ -62,6 +62,7 @@ extern const struct consw dummy_con; /*
extern const struct consw vga_con; /* VGA text console */
extern const struct consw newport_con; /* SGI Newport console */
@@ -163,8 +163,8 @@
int con_is_bound(const struct consw *csw);
int register_con_driver(const struct consw *csw, int first, int last);
---- linux-2.6.19.orig/drivers/video/console/Kconfig
-+++ linux-2.6.19/drivers/video/console/Kconfig
+--- linux-2.6.20.orig/drivers/video/console/Kconfig
++++ linux-2.6.20/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
config VGA_CONSOLE
@@ -174,8 +174,8 @@
default y
help
Saying Y here will allow you to use Linux in text mode through a
---- linux-2.6.19.orig/drivers/video/fbmem.c
-+++ linux-2.6.19/drivers/video/fbmem.c
+--- linux-2.6.20.orig/drivers/video/fbmem.c
++++ linux-2.6.20/drivers/video/fbmem.c
@@ -1204,12 +1204,16 @@ fb_mmap(struct file *file, struct vm_are
vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
else
++++++ patches.xen.tar.bz2 ++++++
++++ 22050 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-02-01 20:19:48.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-02-09 07:14:39.000000000 +0100
@@ -20,8 +20,6 @@
# latest standard kernel patches
# DO NOT MODIFY THEM!
# Send separate patches upstream if you find a problem...
- patches.kernel.org/patch-2.6.20-rc6
- patches.kernel.org/patch-2.6.20-rc6-rc7
########################################################
#
@@ -252,7 +250,10 @@
patches.fixes/libata-ata_piix-acer-aspire-fix
patches.fixes/libata-pata_sis-udma66-fix
- patches.drivers/libata-initialize-variables.patch
+ patches.drivers/libata-ide-fix-drive-side-80c-detection
+ patches.drivers/libata-pata_amd-fix-cable-detection
+ patches.drivers/ide-clear-bmdma-status-in-ide_intr-for-ICHx-controllers
+ patches.drivers/ide-remove-clearing-bmdma-status-from-cdrom_decode_status
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
@@ -410,6 +411,8 @@
patches.suse/libata-pata_sl82c105-reset-delay.patch
+ patches.fixes/fix-key-serial-number-collision-handling.diff
+
# PLEASE KEEP THESE PATCHES AT THE END OF series.conf
# (as all other arch specific patches should be kept at the end
@@ -474,7 +477,7 @@
+2620 patches.xen/xen3-patch-2.6.17
+2620 patches.xen/xen3-patch-2.6.18
+2620 patches.xen/xen3-patch-2.6.19
-+2620 patches.xen/xen3-patch-2.6.20-rc5
++2620 patches.xen/xen3-patch-2.6.20-rc6
+2620 patches.xen/xen3-sysfs-crash-debugging.patch
+andrea patches.xen/xen3-silent-stack-overflow
@@ -492,5 +495,15 @@
+2620 patches.xen/xen-x86-dcr-fallback
+2620 patches.xen/xen-x86-consistent-nmi
+2620 patches.xen/xen-x86-no-lapic
-+2620 patches.xen/xen-blkif-bimodal
++2620 patches.xen/xen-no-video-select
+2620 patches.xen/xen-i386-highpte
++2620 patches.xen/xen-i386-pae-bits
++2620 patches.xen/xen-protocol-bimodal
++2620 patches.xen/xen-blkback-bimodal
++2620 patches.xen/xen-blkback-bimodal-suse
++2620 patches.xen/xen-blkfront-bimodal
++2620 patches.xen/xen-fbfront-bimodal
++2620 patches.xen/xen-export-xenbus_strstate
+
+ # longer commandline
++2620 patches.xen/dynamic-kernel-command-xen.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org