Hello community,
here is the log from the commit of package kernel-source
checked in at Fri Aug 3 23:40:34 CEST 2007.
--------
--- kernel-source/kernel-bigsmp.changes 2007-07-27 10:23:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-08-02 20:15:05.478265000 +0200
@@ -1,0 +2,71 @@
+Thu Aug 2 20:14:02 CEST 2007 - jeffm@suse.de
+
+- Update config files (again).
+
+-------------------------------------------------------------------
+Thu Aug 2 18:02:35 CEST 2007 - jeffm@suse.de
+
+- Update config files.
+
+-------------------------------------------------------------------
+Thu Aug 2 17:38:05 CEST 2007 - jeffm@suse.de
+
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+
+-------------------------------------------------------------------
+Wed Aug 1 22:58:28 CEST 2007 - gregkh@suse.de
+
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+
+-------------------------------------------------------------------
+Wed Aug 1 22:14:13 CEST 2007 - gregkh@suse.de
+
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+
+-------------------------------------------------------------------
+Wed Aug 1 22:05:39 CEST 2007 - gregkh@suse.de
+
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+
+-------------------------------------------------------------------
+Wed Aug 1 10:59:22 CEST 2007 - olh@suse.de
+
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+
+-------------------------------------------------------------------
+Tue Jul 31 15:48:51 CEST 2007 - jeffm@suse.de
+
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+
+-------------------------------------------------------------------
+Tue Jul 31 11:53:19 CEST 2007 - jblunck@suse.de
+
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %kernel_module_package_buildreq
+
+-------------------------------------------------------------------
+Mon Jul 30 10:26:07 CEST 2007 - olh@suse.de
+
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+
+-------------------------------------------------------------------
+Sun Jul 29 05:28:44 CEST 2007 - jjohanse@suse.de
+
+- patches.apparmor/* update to latest version
+
+-------------------------------------------------------------------
+Sat Jul 28 23:38:29 CEST 2007 - sdietrich@suse.de
+
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+
+-------------------------------------------------------------------
+Fri Jul 27 17:32:36 CEST 2007 - jeffm@suse.de
+
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
+
+-------------------------------------------------------------------
kernel-debug.changes: same change
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-ppc64.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
New:
----
pre.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-bigsmp.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:25.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:25.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: Kernel with PAE Support
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -112,6 +113,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -178,7 +180,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -399,6 +401,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:bigsmp:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -565,6 +571,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -572,6 +580,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:26.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: A Debug Version of the Kernel
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -118,6 +119,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -183,7 +185,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -404,6 +406,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:debug:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -570,6 +576,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -577,6 +585,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-default.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:26.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -140,6 +141,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -204,7 +206,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -425,6 +427,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:default:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -591,6 +597,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -598,6 +606,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:26.000000000 +0200
@@ -15,7 +15,7 @@
URL: http://www.kernel.org/
Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%install
@@ -41,6 +41,38 @@
/etc/dummy
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:26.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: kernel for kdump
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -115,6 +116,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -182,7 +184,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -403,6 +405,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:kdump:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -569,6 +575,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -576,6 +584,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:26.000000000 +0200
@@ -51,7 +51,7 @@
%endif
Summary: Kernel for ppc64 Systems
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later, LGPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -68,6 +68,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -116,6 +117,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -194,7 +196,7 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -415,6 +417,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:ppc64:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -581,6 +587,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -588,6 +596,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-rt_debug.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:27.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:27.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: A Debug Version of the Kernel
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -115,6 +116,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -180,7 +182,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -401,6 +403,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:rt_debug:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -567,6 +573,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -574,6 +582,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-rt.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:27.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:27.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Realtime Linux Kernel
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -115,6 +116,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -185,7 +187,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -406,6 +408,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:rt:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -572,6 +578,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -579,6 +587,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:27.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:27.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Standard Kernel
Version: 2.6.22.1
-Release: 6
+Release: 7
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -112,6 +113,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -176,7 +178,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -397,6 +399,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:s390:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -563,6 +569,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -570,6 +578,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:27.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:27.000000000 +0200
@@ -22,7 +22,7 @@
%endif
Summary: The Linux Kernel Sources
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: Development/Sources
Autoreqprov: off
@@ -31,6 +31,7 @@
BuildRequires: kernel-dummy
%endif
Provides: linux
+Provides: kernel-source = 2.6.22.1-%source_rel
%if "kernel-source" == "kernel-source"
Provides: linux lx_suse lx_sus22 lx_sus24
Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24
@@ -38,6 +39,7 @@
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2
Source1: functions.sh
Source2: source-post.sh
+Source10: pre.sh
Source11: post.sh
Source12: postun.sh
Source13: series.conf
@@ -104,7 +106,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -275,6 +277,38 @@
%files -f kernel-source.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:27.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:28.000000000 +0200
@@ -12,9 +12,16 @@
Name: kernel-syms
URL: http://www.kernel.org/
+%if 0%{?opensuse_bs}
+# Strip off the build number ("y") from the "x.y" release number
+%define source_rel %(release=%release; echo ${release%.*})
+%else
+# We don't have build numbers internally
+%define source_rel %release
+%endif
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: Development/Sources
Autoreqprov: off
@@ -57,7 +64,7 @@
#!BuildIgnore: irqbalance xen
#!BuildIgnore: perl-Bootloader mkinitrd
Requires: linux
-Requires: kernel-source = 2.6.22.1-%release
+Requires: kernel-source = 2.6.22.1-%source_rel
Source11: arch-symbols
Source12: guards
Source21: config.conf
@@ -89,7 +96,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -132,6 +139,38 @@
/lib/modules/*/*
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:28.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:28.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -132,6 +133,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -196,7 +198,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -417,6 +419,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:vanilla:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -583,6 +589,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -590,6 +598,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:28.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:28.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Xen Kernel with PAE support
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -110,6 +111,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -179,7 +181,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -400,6 +402,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:xenpae:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -566,6 +572,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -573,6 +581,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ kernel-xen.spec ++++++
--- /var/tmp/diff_new_pack.r23107/_old 2007-08-03 23:36:28.000000000 +0200
+++ /var/tmp/diff_new_pack.r23107/_new 2007-08-03 23:36:28.000000000 +0200
@@ -52,7 +52,7 @@
%endif
Summary: The Xen Kernel
Version: 2.6.22.1
-Release: 8
+Release: 11
License: GPL v2 or later
Group: System/Kernel
Autoreqprov: on
@@ -69,6 +69,7 @@
BuildRequires: makedumpfile
%endif
%endif
+Requires(pre): coreutils awk
Requires(post): module-init-tools
Requires(post): /sbin/depmod
Requires(post): perl-Bootloader >= 0.4.14
@@ -115,6 +116,7 @@
Source1: functions.sh
Source11: postun.sh
Source12: post.sh
+Source12: pre.sh
Source20: series.conf
Source21: config.conf
Source22: supported.conf
@@ -182,7 +184,7 @@
-Source Timestamp: 2007/07/27 07:42:18 UTC
+Source Timestamp: 2007/08/02 18:13:58 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.22.tar.bz2 ]; then
@@ -403,6 +405,10 @@
%endif
# end of build_kdump
%endif
+sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
+ -e "s:@IMAGE@:$image:g" \
+ -e "s:@FLAVOR""@:xen:g" \
+ %_sourcedir/pre.sh > ../pre.sh
( cat %_sourcedir/functions.sh
sed -e "s:@KERNELRELEASE@:$KERNELRELEASE:g" \
-e "s:@IMAGE@:$image:g" \
@@ -569,6 +575,8 @@
install -d -m 755 %buildroot/etc/modprobe.d/
install -m 644 %_sourcedir/module-renames %buildroot/etc/modprobe.d/
+%pre -f pre.sh
+
%post -f post.sh
%postun -f postun.sh
@@ -576,6 +584,38 @@
%files -f kernel.files
%changelog
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files (again).
+* Thu Aug 02 2007 - jeffm@suse.de
+- Update config files.
+* Thu Aug 02 2007 - jeffm@suse.de
+- patches.suse/dm-raid45-2.6.22.1-20070724.patch: dm: add raid45
+ support (experimental) (280972).
+* Wed Aug 01 2007 - gregkh@suse.de
+- fix merge bug in "patches.fixes/hpet_patches_45.patch: Force HPET to be
+ enabled for laptops." as pointed out by aj@suse.de
+* Wed Aug 01 2007 - gregkh@suse.de
+- cleanup patch fuzz to make everything except Xen patches apply cleanly.
+* Wed Aug 01 2007 - gregkh@suse.de
+- patches.fixes/hpet_patches_45.patch: Force HPET to be enabled for laptops
+* Wed Aug 01 2007 - olh@suse.de
+- remove initrd-flavor before rpm -U on small a /boot partition (259303)
+* Tue Jul 31 2007 - jeffm@suse.de
+- Removed default_hz flavor. The nohz=off boot parameter performs
+ the same function.
+* Tue Jul 31 2007 - jblunck@suse.de
+- rpm/kernel-{source,syms}.spec.in: more OpenSUSE Build Service changes
+- rpm/macros.kernel-source: removed unused %%kernel_module_package_buildreq
+* Mon Jul 30 2007 - olh@suse.de
+- build ps3stor_lib, ps3disk and ps3_gelic as module
+* Sun Jul 29 2007 - jjohanse@suse.de
+- patches.apparmor/* update to latest version
+* Sat Jul 28 2007 - sdietrich@suse.de
+- patches.rt/patch-2.6.22.1-rt8-9: update to RT9
+- patches.rt/update_extern_sleep_declarations.patch: Delete-upstream
+* Fri Jul 27 2007 - jeffm@suse.de
+- Enabled tickless timer support on i386 and added a default_hz
+ flavor with it still disabled for suspicious bug triage assistance.
* Fri Jul 27 2007 - agruen@suse.de
- scripts/run_oldconfig.sh: Make it so that config files for
incompatible source trees (with a different subset of patches)
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-07-27 10:23:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-08-02 20:15:00.989769000 +0200
@@ -1 +1 @@
-2007/07/27 07:42:18 UTC
+2007/08/02 18:13:58 UTC
++++++ config.tar.bz2 ++++++
++++ 3732 lines of diff (skipped)
++++++ kabi.tar.bz2 ++++++
++++++ macros.kernel-source ++++++
--- kernel-source/macros.kernel-source 2007-07-27 10:23:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/macros.kernel-source 2007-08-02 20:15:07.636109000 +0200
@@ -33,8 +33,6 @@
%kernel_module_package(n:v:r:s:f:xp:) \
%{expand:%%_kernel_module_package %{-x:-X} %{-n} %{-v} %{-r} %{-s} %{-f} %{-p} %*}
-%kernel_module_package_buildreq kernel-source kernel-syms
-
# suse_kernel_module_package: invert the meaning of the -x flag. (You are not
# supposed to understand why a simple %{-x:}%{!-x:-x} won't work.)
%suse_kernel_module_package(n:v:r:s:f:xp:) \
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2007-07-27 15:18:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-08-02 20:15:25.630097000 +0200
@@ -1 +1 @@
-6000
+6144
++++++ novell-kmp.tar.bz2 ++++++
++++++ patches.apparmor.tar.bz2 ++++++
++++ 2811 lines of diff (skipped)
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/disable-apic-error new/patches.arch/disable-apic-error
--- old/patches.arch/disable-apic-error 2007-05-26 11:06:20.000000000 +0200
+++ new/patches.arch/disable-apic-error 2007-08-02 17:24:16.000000000 +0200
@@ -15,9 +15,9 @@
arch/x86_64/kernel/apic.c | 2 ++
2 files changed, 4 insertions(+)
---- linux-2.6.21.orig/arch/i386/kernel/apic.c
-+++ linux-2.6.21/arch/i386/kernel/apic.c
-@@ -1301,8 +1301,10 @@ void smp_error_interrupt(struct pt_regs
+--- a/arch/i386/kernel/apic.c
++++ b/arch/i386/kernel/apic.c
+@@ -1304,8 +1304,10 @@ void smp_error_interrupt(struct pt_regs
6: Received illegal vector
7: Illegal register address
*/
@@ -28,8 +28,8 @@
irq_exit();
}
---- linux-2.6.21.orig/arch/x86_64/kernel/apic.c
-+++ linux-2.6.21/arch/x86_64/kernel/apic.c
+--- a/arch/x86_64/kernel/apic.c
++++ b/arch/x86_64/kernel/apic.c
@@ -1172,8 +1172,10 @@ asmlinkage void smp_error_interrupt(void
6: Received illegal vector
7: Illegal register address
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-other_console_unregistration.diff new/patches.arch/ppc-ps3tree-other_console_unregistration.diff
--- old/patches.arch/ppc-ps3tree-other_console_unregistration.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-other_console_unregistration.diff 2007-08-02 17:24:16.000000000 +0200
@@ -34,7 +34,7 @@
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
-@@ -2981,8 +2981,7 @@ static int con_is_graphics(const struct
+@@ -2989,8 +2989,7 @@ static int con_is_graphics(const struct
return retval;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-hacks_ps3-legacy-bootloader-hack.diff new/patches.arch/ppc-ps3tree-ps3-hacks_ps3-legacy-bootloader-hack.diff
--- old/patches.arch/ppc-ps3tree-ps3-hacks_ps3-legacy-bootloader-hack.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-hacks_ps3-legacy-bootloader-hack.diff 2007-08-02 17:24:16.000000000 +0200
@@ -24,7 +24,7 @@
return 0;
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
-@@ -210,7 +210,9 @@ static int __init ps3_probe(void)
+@@ -222,7 +222,9 @@ static int __init ps3_probe(void)
DBG(" -> %s:%d\n", __func__, __LINE__);
dt_root = of_get_flat_dt_root();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-stable_ps3-gelic.diff new/patches.arch/ppc-ps3tree-ps3-stable_ps3-gelic.diff
--- old/patches.arch/ppc-ps3tree-ps3-stable_ps3-gelic.diff 2007-06-24 08:37:48.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-stable_ps3-gelic.diff 2007-08-02 17:24:16.000000000 +0200
@@ -17,7 +17,7 @@
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2920,6 +2920,12 @@ M: mikpe@it.uu.se
+@@ -2930,6 +2930,12 @@ M: mikpe@it.uu.se
L: linux-ide@vger.kernel.org
S: Maintained
@@ -32,7 +32,7 @@
M: geoffrey.levand@am.sony.com
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -2264,6 +2264,16 @@ config TSI108_ETH
+@@ -2265,6 +2265,16 @@ config TSI108_ETH
To compile this driver as a module, choose M here: the module
will be called tsi108_eth.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-stable_ps3-update-defconfigs.diff new/patches.arch/ppc-ps3tree-ps3-stable_ps3-update-defconfigs.diff
--- old/patches.arch/ppc-ps3tree-ps3-stable_ps3-update-defconfigs.diff 2007-06-28 08:54:06.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-stable_ps3-update-defconfigs.diff 2007-08-02 17:24:16.000000000 +0200
@@ -4,12 +4,12 @@
Signed-off-by: Geoff Levand
---
- arch/powerpc/configs/ps3_defconfig | 131 +++++++++++++++----------------------
- 1 file changed, 55 insertions(+), 76 deletions(-)
+ arch/powerpc/configs/ps3_defconfig | 54 ++++++++++++++++++++++++-------------
+ 1 file changed, 36 insertions(+), 18 deletions(-)
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
-@@ -152,7 +156,11 @@ CONFIG_PS3_HTAB_SIZE=20
+@@ -156,7 +156,11 @@ CONFIG_PS3_HTAB_SIZE=20
CONFIG_PS3_USE_LPAR_ADDR=y
CONFIG_PS3_VUART=y
CONFIG_PS3_PS3AV=y
@@ -22,7 +22,7 @@
CONFIG_PPC_CELL=y
# CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PPC_IBM_CELL_BLADE is not set
-@@ -343,7 +339,7 @@ CONFIG_BT=m
+@@ -335,7 +339,7 @@ CONFIG_BT=m
CONFIG_BT_L2CAP=m
CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=m
@@ -31,7 +31,7 @@
# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=m
-@@ -352,7 +348,9 @@ CONFIG_BT_HIDP=m
+@@ -344,7 +348,9 @@ CONFIG_BT_HIDP=m
#
CONFIG_BT_HCIUSB=m
CONFIG_BT_HCIUSB_SCO=y
@@ -42,7 +42,7 @@
# CONFIG_BT_HCIBCM203X is not set
# CONFIG_BT_HCIBPA10X is not set
# CONFIG_BT_HCIBFUSB is not set
-@@ -447,7 +441,7 @@ CONFIG_CHR_DEV_SG=m
+@@ -435,7 +441,7 @@ CONFIG_CHR_DEV_SG=m
#
# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
#
@@ -51,17 +51,17 @@
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
# CONFIG_SCSI_SCAN_ASYNC is not set
-@@ -490,7 +479,8 @@ CONFIG_NETDEVICES=y
+@@ -478,7 +484,8 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_ETHERNET is not set
CONFIG_MII=m
CONFIG_NETDEV_1000=y
-+CONFIG_GELIC_NET=y
-CONFIG_NETDEV_10000=y
++CONFIG_GELIC_NET=y
+# CONFIG_NETDEV_10000 is not set
#
# Wireless LAN
-@@ -581,7 +553,27 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+@@ -546,7 +553,27 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
#
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
@@ -90,7 +90,7 @@
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_INPUT_MISC is not set
-@@ -598,7 +590,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+@@ -563,7 +590,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
CONFIG_HW_CONSOLE=y
@@ -99,7 +99,7 @@
# CONFIG_SERIAL_NONSTANDARD is not set
#
-@@ -1125,7 +1113,7 @@ CONFIG_HAS_DMA=y
+@@ -1086,7 +1113,7 @@ CONFIG_HAS_DMA=y
#
# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
@@ -108,7 +108,7 @@
# CONFIG_UNUSED_SYMBOLS is not set
# CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set
-@@ -1155,16 +1143,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
+@@ -1116,16 +1143,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y
# CONFIG_DEBUGGER is not set
CONFIG_IRQSTACKS=y
# CONFIG_BOOTX_TEXT is not set
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_ps3-gelic-wireless.diff new/patches.arch/ppc-ps3tree-ps3-wip_ps3-gelic-wireless.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_ps3-gelic-wireless.diff 2007-06-24 08:37:48.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_ps3-gelic-wireless.diff 2007-08-02 17:24:16.000000000 +0200
@@ -13,7 +13,7 @@
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -2274,6 +2274,14 @@ config GELIC_NET
+@@ -2275,6 +2275,14 @@ config GELIC_NET
To compile this driver as a module, choose M here: the
module will be called ps3_gelic.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_ps3-quick-fix-boot-game-os.diff new/patches.arch/ppc-ps3tree-ps3-wip_ps3-quick-fix-boot-game-os.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_ps3-quick-fix-boot-game-os.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_ps3-quick-fix-boot-game-os.diff 2007-08-02 17:24:16.000000000 +0200
@@ -6,7 +6,7 @@
--- a/drivers/ps3/sys-manager.c
+++ b/drivers/ps3/sys-manager.c
-@@ -612,7 +612,7 @@ static void ps3_sys_manager_final_restar
+@@ -622,7 +622,7 @@ static void ps3_sys_manager_final_restar
ps3_vuart_cancel_async(dev);
ps3_sys_manager_send_attr(dev, 0);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_ps3-sound.diff new/patches.arch/ppc-ps3tree-ps3-wip_ps3-sound.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_ps3-sound.diff 2007-06-24 08:37:48.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_ps3-sound.diff 2007-08-02 17:24:16.000000000 +0200
@@ -11,8 +11,8 @@
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
-@@ -33,3 +33,23 @@ config SND_POWERMAC_AUTO_DRC
- option.
+@@ -49,3 +49,23 @@ config SND_PPC_MPC52xx_AC97
+ the Freescqle MPC52xx AC97 interface.
endmenu
+
@@ -37,7 +37,7 @@
+endmenu
--- a/sound/ppc/Makefile
+++ b/sound/ppc/Makefile
-@@ -6,4 +6,5 @@
+@@ -8,4 +8,5 @@ obj-$(CONFIG_SND_PPC_MPC52xx_AC97) += sn
snd-powermac-objs := powermac.o pmac.o awacs.o burgundy.o daca.o tumbler.o keywest.o beep.o
# Toplevel Module Dependency
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_ps3-zimage-verbose.diff new/patches.arch/ppc-ps3tree-ps3-wip_ps3-zimage-verbose.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_ps3-zimage-verbose.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_ps3-zimage-verbose.diff 2007-08-02 17:24:16.000000000 +0200
@@ -12,7 +12,7 @@
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
-@@ -121,10 +121,15 @@ CROSSWRAP := -C "$(CROSS_COMPILE)"
+@@ -120,10 +120,15 @@ CROSSWRAP := -C "$(CROSS_COMPILE)"
endif
endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_spufs-clear-class-0-interrupt.diff new/patches.arch/ppc-ps3tree-ps3-wip_spufs-clear-class-0-interrupt.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_spufs-clear-class-0-interrupt.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_spufs-clear-class-0-interrupt.diff 2007-08-02 17:24:16.000000000 +0200
@@ -27,9 +27,9 @@
include/asm-powerpc/spu.h | 2 +-
2 files changed, 16 insertions(+), 9 deletions(-)
---- ps3-linux-2.6.20.orig/arch/powerpc/platforms/cell/spu_base.c
-+++ ps3-linux-2.6.20/arch/powerpc/platforms/cell/spu_base.c
-@@ -158,27 +158,34 @@ static irqreturn_t
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c
+@@ -218,27 +218,34 @@ static irqreturn_t
spu_irq_class_0(int irq, void *data)
{
struct spu *spu;
@@ -72,8 +72,8 @@
if (stat & 1) /* invalid DMA alignment */
__spu_trap_dma_align(spu);
---- ps3-linux-2.6.20.orig/include/asm-powerpc/spu.h
-+++ ps3-linux-2.6.20/include/asm-powerpc/spu.h
+--- a/include/asm-powerpc/spu.h
++++ b/include/asm-powerpc/spu.h
@@ -122,6 +122,7 @@ struct spu {
u64 flags;
u64 dar;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-ps3-wip_spufs-wrap-master-run-bit.diff new/patches.arch/ppc-ps3tree-ps3-wip_spufs-wrap-master-run-bit.diff
--- old/patches.arch/ppc-ps3tree-ps3-wip_spufs-wrap-master-run-bit.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-ps3-wip_spufs-wrap-master-run-bit.diff 2007-08-02 17:24:16.000000000 +0200
@@ -40,7 +40,7 @@
#include "interrupt.h"
struct device_node *spu_devnode(struct spu *spu)
-@@ -359,8 +360,22 @@ static int of_destroy_spu(struct spu *sp
+@@ -361,8 +362,22 @@ static int of_destroy_spu(struct spu *sp
return 0;
}
@@ -151,8 +151,8 @@
#include "platform.h"
/* spu_management_ops */
-@@ -407,10 +408,23 @@ static int __init ps3_enumerate_spus(int
- return result;
+@@ -414,10 +415,23 @@ static int __init ps3_enumerate_spus(int
+ return num_resource_id;
}
+static int ps3_enable_spu(struct spu_context *ctx)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-spe-logo_logo-extra-spe-glue-2.6.21.diff new/patches.arch/ppc-ps3tree-spe-logo_logo-extra-spe-glue-2.6.21.diff
--- old/patches.arch/ppc-ps3tree-spe-logo_logo-extra-spe-glue-2.6.21.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-spe-logo_logo-extra-spe-glue-2.6.21.diff 2007-08-02 17:24:16.000000000 +0200
@@ -13,8 +13,8 @@
arch/powerpc/platforms/ps3/spu.c | 6 ++++--
3 files changed, 12 insertions(+), 4 deletions(-)
---- ps3-linux-2.6.21.orig/arch/powerpc/platforms/cell/spu_base.c
-+++ ps3-linux-2.6.21/arch/powerpc/platforms/cell/spu_base.c
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -31,6 +31,7 @@
#include
#include
@@ -23,7 +23,7 @@
#include
#include
#include
-@@ -624,12 +625,15 @@ static int __init init_spu_base(void)
+@@ -613,12 +614,15 @@ static int __init init_spu_base(void)
ret = spu_enumerate_spus(create_spu);
@@ -40,9 +40,9 @@
xmon_register_spus(&spu_full_list);
return 0;
---- ps3-linux-2.6.21.orig/arch/powerpc/platforms/cell/spu_manage.c
-+++ ps3-linux-2.6.21/arch/powerpc/platforms/cell/spu_manage.c
-@@ -280,6 +280,7 @@ static int __init of_enumerate_spus(int
+--- a/arch/powerpc/platforms/cell/spu_manage.c
++++ b/arch/powerpc/platforms/cell/spu_manage.c
+@@ -279,6 +279,7 @@ static int __init of_enumerate_spus(int
{
int ret;
struct device_node *node;
@@ -50,7 +50,7 @@
ret = -ENODEV;
for (node = of_find_node_by_type(NULL, "spe");
-@@ -290,8 +291,9 @@ static int __init of_enumerate_spus(int
+@@ -289,8 +290,9 @@ static int __init of_enumerate_spus(int
__FUNCTION__, node->name);
break;
}
@@ -61,9 +61,9 @@
}
static int __init of_create_spu(struct spu *spu, void *data)
---- ps3-linux-2.6.21.orig/arch/powerpc/platforms/ps3/spu.c
-+++ ps3-linux-2.6.21/arch/powerpc/platforms/ps3/spu.c
-@@ -401,11 +401,13 @@ static int __init ps3_enumerate_spus(int
+--- a/arch/powerpc/platforms/ps3/spu.c
++++ b/arch/powerpc/platforms/ps3/spu.c
+@@ -405,11 +405,13 @@ static int __init ps3_enumerate_spus(int
}
}
@@ -78,4 +78,4 @@
+ return num_resource_id;
}
- static int ps3_enable_spu(struct spu_context *ctx)
+ const struct spu_management_ops spu_management_ps3_ops = {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3tree-spe-logo_logo_spe_clut224.diff new/patches.arch/ppc-ps3tree-spe-logo_logo_spe_clut224.diff
--- old/patches.arch/ppc-ps3tree-spe-logo_logo_spe_clut224.diff 2007-06-18 15:54:58.000000000 +0200
+++ new/patches.arch/ppc-ps3tree-spe-logo_logo_spe_clut224.diff 2007-08-02 17:24:16.000000000 +0200
@@ -12,8 +12,8 @@
include/linux/linux_logo.h | 1
3 files changed, 286 insertions(+)
---- ps3-linux-2.6.21.orig/drivers/video/logo/Makefile
-+++ ps3-linux-2.6.21/drivers/video/logo/Makefile
+--- a/drivers/video/logo/Makefile
++++ b/drivers/video/logo/Makefile
@@ -14,6 +14,8 @@ obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
@@ -24,7 +24,7 @@
# Use logo-cfiles to retrieve list of .c files to be built
--- /dev/null
-+++ ps3-linux-2.6.21/drivers/video/logo/logo_spe_clut224.ppm
++++ b/drivers/video/logo/logo_spe_clut224.ppm
@@ -0,0 +1,283 @@
+P3
+40 40
@@ -309,8 +309,8 @@
+2 2 2 12 12 12 30 30 31 40 40 40 32 32 32 16 16 16
+2 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0
---- ps3-linux-2.6.21.orig/include/linux/linux_logo.h
-+++ ps3-linux-2.6.21/include/linux/linux_logo.h
+--- a/include/linux/linux_logo.h
++++ b/include/linux/linux_logo.h
@@ -44,6 +44,7 @@ extern const struct linux_logo logo_supe
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
@@ -318,4 +318,4 @@
+extern const struct linux_logo logo_spe_clut224;
extern const struct linux_logo *fb_find_logo(int depth);
- #ifdef CONFIG_LOGO
+ #if defined(CONFIG_LOGO) && defined(CONFIG_FB)
++++++ patches.drivers.tar.bz2 ++++++
++++ 17718 lines of diff (skipped)
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/acpi_debug.patch new/patches.fixes/acpi_debug.patch
--- old/patches.fixes/acpi_debug.patch 2007-06-12 18:05:39.000000000 +0200
+++ new/patches.fixes/acpi_debug.patch 2007-08-02 17:24:17.000000000 +0200
@@ -20,10 +20,15 @@
Signed-off-by: Len Brown
---
-diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
+---
+ drivers/acpi/Kconfig | 8 ++++++++
+ include/acpi/acmacros.h | 23 +++++++++++++++++++++++
+ include/acpi/acoutput.h | 4 ++--
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
-@@ -280,6 +280,14 @@ config ACPI_DEBUG
+@@ -297,6 +297,14 @@ config ACPI_DEBUG
of verbosity. Saying Y enables these statements. This will increase
your kernel size by around 50K.
@@ -38,8 +43,6 @@
config ACPI_EC
bool
default y
-diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
-index 8948a64..c22f6da 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -486,6 +486,8 @@
@@ -79,8 +82,6 @@
/* Conditional execution */
#define ACPI_DEBUG_EXEC(a) a
-diff --git a/include/acpi/acoutput.h b/include/acpi/acoutput.h
-index 7812267..c090a8b 100644
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
@@ -178,8 +178,8 @@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/drivers-uevent.patch new/patches.fixes/drivers-uevent.patch
--- old/patches.fixes/drivers-uevent.patch 2007-07-26 17:11:46.000000000 +0200
+++ new/patches.fixes/drivers-uevent.patch 2007-08-01 22:12:13.000000000 +0200
@@ -7,11 +7,13 @@
Signed-off-by: Hannes Reinecke
-diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index ff850d1..5be43d3 100644
+---
+ drivers/base/bus.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
-@@ -599,6 +599,15 @@ static inline int add_probe_files(struct bus_type *bus) { return 0; }
+@@ -592,6 +592,15 @@ static inline int add_probe_files(struct
static inline void remove_probe_files(struct bus_type *bus) {}
#endif
@@ -27,7 +29,7 @@
/**
* bus_add_driver - Add a driver to the bus.
* @drv: driver.
-@@ -629,6 +638,11 @@ int bus_add_driver(struct device_driver *drv)
+@@ -621,6 +630,11 @@ int bus_add_driver(struct device_driver
klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
module_add_driver(drv->owner, drv);
@@ -39,7 +41,7 @@
error = driver_add_attrs(bus, drv);
if (error) {
/* How the hell do we get out of this pickle? Give up */
-@@ -666,6 +680,7 @@ void bus_remove_driver(struct device_driver * drv)
+@@ -658,6 +672,7 @@ void bus_remove_driver(struct device_dri
remove_bind_files(drv);
driver_remove_attrs(drv->bus, drv);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/hpet_patches_45.patch new/patches.fixes/hpet_patches_45.patch
--- old/patches.fixes/hpet_patches_45.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/hpet_patches_45.patch 2007-08-01 22:56:13.000000000 +0200
@@ -0,0 +1,484 @@
+From: someone@intel.com
+Subject: Force HPET to be enabled for laptops
+Patch-mainline: 2.6.24 hopefully
+
+Found at: http://www.linuxpowertop.org/patches/hpet_patches_45.patch
+
+This is also in the -mm tree
+
+Signed-off-by: Greg Kroah-Hartman
+
+---
+ arch/i386/kernel/apic.c | 3 +
+ arch/i386/kernel/hpet.c | 101 ++++++++++++++-----------------------------
+ arch/i386/kernel/i8253.c | 26 +++++------
+ arch/i386/kernel/quirks.c | 101 +++++++++++++++++++++++++++++++++++++++++++
+ include/asm-i386/hpet.h | 3 +
+ include/linux/clockchips.h | 1
+ kernel/time/tick-broadcast.c | 17 +++----
+ kernel/time/tick-common.c | 20 +++++---
+ 8 files changed, 176 insertions(+), 96 deletions(-)
+
+--- a/arch/i386/kernel/apic.c
++++ b/arch/i386/kernel/apic.c
+@@ -263,6 +263,9 @@ static void lapic_timer_setup(enum clock
+ v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
+ apic_write_around(APIC_LVTT, v);
+ break;
++ case CLOCK_EVT_MODE_RESUME:
++ /* Nothing to do here */
++ break;
+ }
+
+ local_irq_restore(flags);
+--- a/arch/i386/kernel/hpet.c
++++ b/arch/i386/kernel/hpet.c
+@@ -125,6 +125,7 @@ static struct clock_event_device hpet_cl
+ .set_next_event = hpet_next_event,
+ .shift = 32,
+ .irq = 0,
++ .rating = 50,
+ };
+
+ static void hpet_start_counter(void)
+@@ -139,6 +140,12 @@ static void hpet_start_counter(void)
+ hpet_writel(cfg, HPET_CFG);
+ }
+
++static void hpet_restart_counter(void)
++{
++ ich_force_hpet_resume();
++ hpet_start_counter();
++}
++
+ static void hpet_enable_int(void)
+ {
+ unsigned long cfg = hpet_readl(HPET_CFG);
+@@ -187,6 +194,10 @@ static void hpet_set_mode(enum clock_eve
+ cfg &= ~HPET_TN_ENABLE;
+ hpet_writel(cfg, HPET_T0_CFG);
+ break;
++
++ case CLOCK_EVT_MODE_RESUME:
++ hpet_enable_int();
++ break;
+ }
+ }
+
+@@ -217,6 +228,7 @@ static struct clocksource clocksource_hp
+ .mask = HPET_MASK,
+ .shift = HPET_SHIFT,
+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
++ .resume = hpet_restart_counter,
+ };
+
+ /*
+@@ -228,6 +240,9 @@ int __init hpet_enable(void)
+ uint64_t hpet_freq;
+ u64 tmp;
+
++ if (hpet_virt_address)
++ return 0;
++
+ if (!is_hpet_capable())
+ return 0;
+
+@@ -291,7 +306,6 @@ int __init hpet_enable(void)
+
+ clocksource_register(&clocksource_hpet);
+
+-
+ if (id & HPET_ID_LEGSUP) {
+ hpet_enable_int();
+ hpet_reserve_platform_timers(id);
+@@ -314,6 +328,26 @@ out_nohpet:
+ }
+
+
++static int __init hpet_late_init(void)
++{
++ if (boot_hpet_disable)
++ return -ENODEV;
++
++ if (!hpet_address) {
++ if (!force_hpet_address)
++ return -ENODEV;
++
++ hpet_address = force_hpet_address;
++ hpet_enable();
++ if (!hpet_virt_address)
++ return -ENODEV;
++ }
++
++ return 0;
++}
++module_init(hpet_late_init);
++
++
+ #ifdef CONFIG_HPET_EMULATE_RTC
+
+ /* HPET in LegacyReplacement Mode eats up RTC interrupt line. When, HPET
+@@ -524,68 +558,3 @@ irqreturn_t hpet_rtc_interrupt(int irq,
+ return IRQ_HANDLED;
+ }
+ #endif
+-
+-
+-/*
+- * Suspend/resume part
+- */
+-
+-#ifdef CONFIG_PM
+-
+-static int hpet_suspend(struct sys_device *sys_device, pm_message_t state)
+-{
+- unsigned long cfg = hpet_readl(HPET_CFG);
+-
+- cfg &= ~(HPET_CFG_ENABLE|HPET_CFG_LEGACY);
+- hpet_writel(cfg, HPET_CFG);
+-
+- return 0;
+-}
+-
+-static int hpet_resume(struct sys_device *sys_device)
+-{
+- unsigned int id;
+-
+- hpet_start_counter();
+-
+- id = hpet_readl(HPET_ID);
+-
+- if (id & HPET_ID_LEGSUP)
+- hpet_enable_int();
+-
+- return 0;
+-}
+-
+-static struct sysdev_class hpet_class = {
+- set_kset_name("hpet"),
+- .suspend = hpet_suspend,
+- .resume = hpet_resume,
+-};
+-
+-static struct sys_device hpet_device = {
+- .id = 0,
+- .cls = &hpet_class,
+-};
+-
+-
+-static __init int hpet_register_sysfs(void)
+-{
+- int err;
+-
+- if (!is_hpet_capable())
+- return 0;
+-
+- err = sysdev_class_register(&hpet_class);
+-
+- if (!err) {
+- err = sysdev_register(&hpet_device);
+- if (err)
+- sysdev_class_unregister(&hpet_class);
+- }
+-
+- return err;
+-}
+-
+-device_initcall(hpet_register_sysfs);
+-
+-#endif
+--- a/arch/i386/kernel/i8253.c
++++ b/arch/i386/kernel/i8253.c
+@@ -3,11 +3,11 @@
+ *
+ */
+ #include
+-#include
++#include
++#include
+ #include
+-#include
+ #include
+-#include
++#include
+
+ #include
+ #include
+@@ -41,26 +41,24 @@ static void init_pit_timer(enum clock_ev
+ case CLOCK_EVT_MODE_PERIODIC:
+ /* binary, mode 2, LSB/MSB, ch 0 */
+ outb_p(0x34, PIT_MODE);
+- udelay(10);
+ outb_p(LATCH & 0xff , PIT_CH0); /* LSB */
+- udelay(10);
+ outb(LATCH >> 8 , PIT_CH0); /* MSB */
+ break;
+
+- /*
+- * Avoid unnecessary state transitions, as it confuses
+- * Geode / Cyrix based boxen.
+- */
+ case CLOCK_EVT_MODE_SHUTDOWN:
+- if (evt->mode == CLOCK_EVT_MODE_UNUSED)
+- break;
+ case CLOCK_EVT_MODE_UNUSED:
+- if (evt->mode == CLOCK_EVT_MODE_SHUTDOWN)
+- break;
++ outb_p(0x30, PIT_MODE);
++ outb_p(0, PIT_CH0); /* LSB */
++ outb_p(0, PIT_CH0); /* MSB */
++ break;
++
+ case CLOCK_EVT_MODE_ONESHOT:
+ /* One shot setup */
+ outb_p(0x38, PIT_MODE);
+- udelay(10);
++ break;
++
++ case CLOCK_EVT_MODE_RESUME:
++ /* Nothing to do here */
+ break;
+ }
+ spin_unlock_irqrestore(&i8253_lock, flags);
+--- a/arch/i386/kernel/quirks.c
++++ b/arch/i386/kernel/quirks.c
+@@ -4,6 +4,8 @@
+ #include
+ #include
+
++#include
++
+ #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_SMP) && defined(CONFIG_PCI)
+
+ static void __devinit quirk_intel_irqbalance(struct pci_dev *dev)
+@@ -47,3 +49,102 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quirk_intel_irqbalance);
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, quirk_intel_irqbalance);
+ #endif
++
++#if defined(CONFIG_HPET_TIMER)
++unsigned long force_hpet_address;
++
++static void __iomem *rcba_base;
++
++void ich_force_hpet_resume(void)
++{
++ u32 val;
++
++ if (!force_hpet_address)
++ return;
++
++ if (rcba_base == NULL)
++ BUG();
++
++ /* read the Function Disable register, dword mode only */
++ val = readl(rcba_base + 0x3404);
++ if (!(val & 0x80)) {
++ /* HPET disabled in HPTC. Trying to enable */
++ writel(val | 0x80, rcba_base + 0x3404);
++ }
++
++ val = readl(rcba_base + 0x3404);
++ if (!(val & 0x80))
++ BUG();
++ else
++ printk(KERN_DEBUG "Force enabled HPET at resume\n");
++
++ return;
++}
++
++static void ich_force_enable_hpet(struct pci_dev *dev)
++{
++ u32 val, rcba;
++ int err = 0;
++
++ if (hpet_address || force_hpet_address)
++ return;
++
++ pci_read_config_dword(dev, 0xF0, &rcba);
++ rcba &= 0xFFFFC000;
++ if (rcba == 0) {
++ printk(KERN_DEBUG "RCBA disabled. Cannot force enable HPET\n");
++ return;
++ }
++
++ /* use bits 31:14, 16 kB aligned */
++ rcba_base = ioremap_nocache(rcba, 0x4000);
++ if (rcba_base == NULL) {
++ printk(KERN_DEBUG "ioremap failed. Cannot force enable HPET\n");
++ return;
++ }
++
++ /* read the Function Disable register, dword mode only */
++ val = readl(rcba_base + 0x3404);
++
++ if (val & 0x80) {
++ /* HPET is enabled in HPTC. Just not reported by BIOS */
++ val = val & 0x3;
++ force_hpet_address = 0xFED00000 | (val << 12);
++ printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
++ force_hpet_address);
++ iounmap(rcba_base);
++ return;
++ }
++
++ /* HPET disabled in HPTC. Trying to enable */
++ writel(val | 0x80, rcba_base + 0x3404);
++
++ val = readl(rcba_base + 0x3404);
++ if (!(val & 0x80)) {
++ err = 1;
++ } else {
++ val = val & 0x3;
++ force_hpet_address = 0xFED00000 | (val << 12);
++ }
++
++ if (err) {
++ force_hpet_address = 0;
++ iounmap(rcba_base);
++ printk(KERN_DEBUG "Failed to force enable HPET\n");
++ } else {
++ printk(KERN_DEBUG "Force enabled HPET at base address 0x%lx\n",
++ force_hpet_address);
++ }
++}
++
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,
++ ich_force_enable_hpet);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
++ ich_force_enable_hpet);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1,
++ ich_force_enable_hpet);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_31,
++ ich_force_enable_hpet);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_1,
++ ich_force_enable_hpet);
++#endif
+--- a/include/asm-i386/hpet.h
++++ b/include/asm-i386/hpet.h
+@@ -89,6 +89,7 @@
+ #define HPET_TICK_RATE (HZ * 100000UL)
+
+ extern unsigned long hpet_address; /* hpet memory map physical address */
++extern unsigned long force_hpet_address;
+ extern int is_hpet_enabled(void);
+
+ #ifdef CONFIG_X86_64
+@@ -102,6 +103,8 @@ extern int hpet_readl(unsigned long a);
+ extern int hpet_enable(void);
+ #endif
+
++void ich_force_hpet_resume(void);
++
+ #ifdef CONFIG_HPET_EMULATE_RTC
+ extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask);
+ extern int hpet_set_rtc_irq_bit(unsigned long bit_mask);
+--- a/include/linux/clockchips.h
++++ b/include/linux/clockchips.h
+@@ -23,6 +23,7 @@ enum clock_event_mode {
+ CLOCK_EVT_MODE_SHUTDOWN,
+ CLOCK_EVT_MODE_PERIODIC,
+ CLOCK_EVT_MODE_ONESHOT,
++ CLOCK_EVT_MODE_RESUME,
+ };
+
+ /* Clock event notification values */
+--- a/kernel/time/tick-broadcast.c
++++ b/kernel/time/tick-broadcast.c
+@@ -58,8 +58,9 @@ static void tick_broadcast_start_periodi
+ */
+ int tick_check_broadcast_device(struct clock_event_device *dev)
+ {
+- if (tick_broadcast_device.evtdev ||
+- (dev->features & CLOCK_EVT_FEAT_C3STOP))
++ if ((tick_broadcast_device.evtdev &&
++ tick_broadcast_device.evtdev->rating >= dev->rating) ||
++ (dev->features & CLOCK_EVT_FEAT_C3STOP))
+ return 0;
+
+ clockevents_exchange_device(NULL, dev);
+@@ -299,7 +300,7 @@ void tick_suspend_broadcast(void)
+ spin_lock_irqsave(&tick_broadcast_lock, flags);
+
+ bc = tick_broadcast_device.evtdev;
+- if (bc && tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
++ if (bc)
+ clockevents_set_mode(bc, CLOCK_EVT_MODE_SHUTDOWN);
+
+ spin_unlock_irqrestore(&tick_broadcast_lock, flags);
+@@ -316,6 +317,8 @@ int tick_resume_broadcast(void)
+ bc = tick_broadcast_device.evtdev;
+
+ if (bc) {
++ clockevents_set_mode(bc, CLOCK_EVT_MODE_RESUME);
++
+ switch (tick_broadcast_device.mode) {
+ case TICKDEV_MODE_PERIODIC:
+ if(!cpus_empty(tick_broadcast_mask))
+@@ -490,11 +493,9 @@ out:
+ */
+ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
+ {
+- if (bc->mode != CLOCK_EVT_MODE_ONESHOT) {
+- bc->event_handler = tick_handle_oneshot_broadcast;
+- clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+- bc->next_event.tv64 = KTIME_MAX;
+- }
++ bc->event_handler = tick_handle_oneshot_broadcast;
++ clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
++ bc->next_event.tv64 = KTIME_MAX;
+ }
+
+ /*
+--- a/kernel/time/tick-common.c
++++ b/kernel/time/tick-common.c
+@@ -200,7 +200,7 @@ static int tick_check_new_device(struct
+
+ cpu = smp_processor_id();
+ if (!cpu_isset(cpu, newdev->cpumask))
+- goto out;
++ goto out_bc;
+
+ td = &per_cpu(tick_cpu_device, cpu);
+ curdev = td->evtdev;
+@@ -265,7 +265,7 @@ out_bc:
+ */
+ if (tick_check_broadcast_device(newdev))
+ ret = NOTIFY_STOP;
+-out:
++
+ spin_unlock_irqrestore(&tick_device_lock, flags);
+
+ return ret;
+@@ -318,12 +318,17 @@ static void tick_resume(void)
+ {
+ struct tick_device *td = &__get_cpu_var(tick_cpu_device);
+ unsigned long flags;
++ int broadcast = tick_resume_broadcast();
+
+ spin_lock_irqsave(&tick_device_lock, flags);
+- if (td->mode == TICKDEV_MODE_PERIODIC)
+- tick_setup_periodic(td->evtdev, 0);
+- else
+- tick_resume_oneshot();
++ clockevents_set_mode(td->evtdev, CLOCK_EVT_MODE_RESUME);
++
++ if (!broadcast) {
++ if (td->mode == TICKDEV_MODE_PERIODIC)
++ tick_setup_periodic(td->evtdev, 0);
++ else
++ tick_resume_oneshot();
++ }
+ spin_unlock_irqrestore(&tick_device_lock, flags);
+ }
+
+@@ -360,8 +365,7 @@ static int tick_notify(struct notifier_b
+ break;
+
+ case CLOCK_EVT_NOTIFY_RESUME:
+- if (!tick_resume_broadcast())
+- tick_resume();
++ tick_resume();
+ break;
+
+ default:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/ipv6-no-autoconf new/patches.fixes/ipv6-no-autoconf
--- old/patches.fixes/ipv6-no-autoconf 2007-05-26 11:06:20.000000000 +0200
+++ new/patches.fixes/ipv6-no-autoconf 2007-08-02 17:24:18.000000000 +0200
@@ -15,11 +15,11 @@
interface before bringing it up will suppress autoconfiguration.
net/ipv6/addrconf.c | 2 ++
- 1 files changed, 2 insertions(+)
+ 1 file changed, 2 insertions(+)
---- linux-2.6.21.orig/net/ipv6/addrconf.c
-+++ linux-2.6.21/net/ipv6/addrconf.c
-@@ -2589,6 +2589,7 @@ static void addrconf_dad_start(struct in
+--- a/net/ipv6/addrconf.c
++++ b/net/ipv6/addrconf.c
+@@ -2578,6 +2578,7 @@ static void addrconf_dad_start(struct in
spin_lock_bh(&ifp->lock);
if (dev->flags&(IFF_NOARP|IFF_LOOPBACK) ||
@@ -27,7 +27,7 @@
!(ifp->flags&IFA_F_TENTATIVE) ||
ifp->flags & IFA_F_NODAD) {
ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC);
-@@ -2682,6 +2683,7 @@ static void addrconf_dad_completed(struc
+@@ -2671,6 +2672,7 @@ static void addrconf_dad_completed(struc
if (ifp->idev->cnf.forwarding == 0 &&
ifp->idev->cnf.rtr_solicits > 0 &&
(dev->flags&IFF_LOOPBACK) == 0 &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/mptbase-vmware-fix new/patches.fixes/mptbase-vmware-fix
--- old/patches.fixes/mptbase-vmware-fix 2007-04-18 10:42:00.000000000 +0200
+++ new/patches.fixes/mptbase-vmware-fix 2007-08-02 17:24:18.000000000 +0200
@@ -7,11 +7,13 @@
Signed-off-by: Hannes Reinecke
-diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
-index 97471af..b3eb367 100644
+---
+ drivers/message/fusion/mptbase.c | 12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
-@@ -2567,6 +2567,16 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
+@@ -2568,6 +2568,16 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
pfacts->IOCStatus = le16_to_cpu(pfacts->IOCStatus);
pfacts->IOCLogInfo = le32_to_cpu(pfacts->IOCLogInfo);
pfacts->MaxDevices = le16_to_cpu(pfacts->MaxDevices);
@@ -28,7 +30,7 @@
pfacts->PortSCSIID = le16_to_cpu(pfacts->PortSCSIID);
pfacts->ProtocolFlags = le16_to_cpu(pfacts->ProtocolFlags);
pfacts->MaxPostedCmdBuffers = le16_to_cpu(pfacts->MaxPostedCmdBuffers);
-@@ -2574,7 +2584,7 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
+@@ -2575,7 +2585,7 @@ GetPortFacts(MPT_ADAPTER *ioc, int portn
pfacts->MaxLanBuckets = le16_to_cpu(pfacts->MaxLanBuckets);
max_id = (ioc->bus_type == SAS) ? pfacts->PortSCSIID :
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/scsi-conditionally-build-dma-functions new/patches.fixes/scsi-conditionally-build-dma-functions
--- old/patches.fixes/scsi-conditionally-build-dma-functions 2007-07-11 10:05:14.000000000 +0200
+++ new/patches.fixes/scsi-conditionally-build-dma-functions 2007-08-01 22:12:13.000000000 +0200
@@ -9,14 +9,12 @@
Signed-off-by: Hannes Reinecke
7f74976ba4b3e96339b2923746ddaf6f46b081e5
drivers/scsi/Kconfig | 5 ++++
- drivers/scsi/Makefile | 6 ++--
- drivers/scsi/scsi_lib.c | 38 --------------------------------
- drivers/scsi/scsi_lib_dma.c | 50 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/scsi/Makefile | 6 ++---
+ drivers/scsi/scsi_lib.c | 38 ---------------------------------
+ drivers/scsi/scsi_lib_dma.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
include/scsi/scsi_cmnd.h | 2 +
5 files changed, 60 insertions(+), 41 deletions(-)
-diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
-index 874cfee..6ac3873 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -10,6 +10,7 @@ config RAID_ATTRS
@@ -38,11 +36,9 @@
config SCSI_TGT
tristate "SCSI target support"
depends on SCSI && EXPERIMENTAL
-diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
-index 3027b53..80735d6 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
-@@ -149,9 +149,9 @@ obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
+@@ -150,9 +150,9 @@ obj-$(CONFIG_SCSI_DEBUG) += scsi_debug.o
obj-$(CONFIG_SCSI_WAIT_SCAN) += scsi_wait_scan.o
scsi_mod-y += scsi.o hosts.o scsi_ioctl.o constants.o \
@@ -55,8 +51,6 @@
scsi_mod-$(CONFIG_SCSI_NETLINK) += scsi_netlink.o
scsi_mod-$(CONFIG_SYSCTL) += scsi_sysctl.o
scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o
-diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 70454b4..1f5a07b 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2290,41 +2290,3 @@ void scsi_kunmap_atomic_sg(void *virt)
@@ -101,9 +95,6 @@
- }
-}
-EXPORT_SYMBOL(scsi_dma_unmap);
-diff --git a/drivers/scsi/scsi_lib_dma.c b/drivers/scsi/scsi_lib_dma.c
-new file mode 100644
-index 0000000..ac6855c
--- /dev/null
+++ b/drivers/scsi/scsi_lib_dma.c
@@ -0,0 +1,50 @@
@@ -157,11 +148,9 @@
+ }
+}
+EXPORT_SYMBOL(scsi_dma_unmap);
-diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
-index 53e1705..c4cb410 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
-@@ -135,8 +135,10 @@ extern void scsi_kunmap_atomic_sg(void *virt);
+@@ -135,8 +135,10 @@ extern void scsi_kunmap_atomic_sg(void *
extern struct scatterlist *scsi_alloc_sgtable(struct scsi_cmnd *, gfp_t);
extern void scsi_free_sgtable(struct scatterlist *, int);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/tiocgdev new/patches.fixes/tiocgdev
--- old/patches.fixes/tiocgdev 2007-05-26 11:06:20.000000000 +0200
+++ new/patches.fixes/tiocgdev 2007-08-02 17:24:18.000000000 +0200
@@ -20,11 +20,9 @@
include/asm-x86_64/ioctls.h | 1 +
14 files changed, 28 insertions(+)
-Index: linux-2.6.21/drivers/char/tty_io.c
-===================================================================
---- linux-2.6.21.orig/drivers/char/tty_io.c 2007-05-26 09:51:22.000000000 +0200
-+++ linux-2.6.21/drivers/char/tty_io.c 2007-05-26 09:52:01.000000000 +0200
-@@ -3347,6 +3347,21 @@ int tty_ioctl(struct inode * inode, stru
+--- a/drivers/char/tty_io.c
++++ b/drivers/char/tty_io.c
+@@ -3354,6 +3354,21 @@ int tty_ioctl(struct inode * inode, stru
return tioclinux(tty, arg);
#endif
/*
@@ -46,11 +44,9 @@
* Break handling
*/
case TIOCSBRK: /* Turn break on, unconditionally */
-Index: linux-2.6.21/fs/compat_ioctl.c
-===================================================================
---- linux-2.6.21.orig/fs/compat_ioctl.c 2007-05-26 09:51:29.000000000 +0200
-+++ linux-2.6.21/fs/compat_ioctl.c 2007-05-26 09:51:47.000000000 +0200
-@@ -2434,6 +2434,7 @@ COMPATIBLE_IOCTL(TCSETSW)
+--- a/fs/compat_ioctl.c
++++ b/fs/compat_ioctl.c
+@@ -2451,6 +2451,7 @@ COMPATIBLE_IOCTL(TCSETSW)
COMPATIBLE_IOCTL(TCSETSF)
COMPATIBLE_IOCTL(TIOCLINUX)
COMPATIBLE_IOCTL(TIOCSBRK)
@@ -58,10 +54,8 @@
COMPATIBLE_IOCTL(TIOCCBRK)
ULONG_IOCTL(TIOCMIWAIT)
COMPATIBLE_IOCTL(TIOCGICOUNT)
-Index: linux-2.6.21/include/asm-alpha/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-alpha/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-alpha/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-alpha/ioctls.h
++++ b/include/asm-alpha/ioctls.h
@@ -91,6 +91,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -70,22 +64,18 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
-Index: linux-2.6.21/include/asm-arm/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-arm/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-arm/ioctls.h 2007-05-26 09:51:47.000000000 +0200
-@@ -48,6 +48,7 @@
- #define TIOCGSID 0x5429 /* Return the session ID of FD */
+--- a/include/asm-arm/ioctls.h
++++ b/include/asm-arm/ioctls.h
+@@ -52,6 +52,7 @@
+ #define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
#define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */
+#define TIOCGDEV _IOR('T',0x32, unsigned int) /* Get real dev no below /dev/console */
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: linux-2.6.21/include/asm-i386/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-i386/ioctls.h 2007-05-26 09:51:34.000000000 +0200
-+++ linux-2.6.21/include/asm-i386/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-i386/ioctls.h
++++ b/include/asm-i386/ioctls.h
@@ -53,6 +53,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -94,10 +84,8 @@
#define FIONCLEX 0x5450
#define FIOCLEX 0x5451
-Index: linux-2.6.21/include/asm-ia64/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-ia64/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-ia64/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-ia64/ioctls.h
++++ b/include/asm-ia64/ioctls.h
@@ -55,6 +55,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -106,10 +94,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: linux-2.6.21/include/asm-m68k/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-m68k/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-m68k/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-m68k/ioctls.h
++++ b/include/asm-m68k/ioctls.h
@@ -48,6 +48,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -118,10 +104,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: linux-2.6.21/include/asm-mips/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-mips/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-mips/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-mips/ioctls.h
++++ b/include/asm-mips/ioctls.h
@@ -79,6 +79,7 @@
#define TIOCGSID 0x7416 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -130,10 +114,8 @@
/* I hope the range from 0x5480 on is free ... */
#define TIOCSCTTY 0x5480 /* become controlling tty */
-Index: linux-2.6.21/include/asm-powerpc/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-powerpc/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-powerpc/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-powerpc/ioctls.h
++++ b/include/asm-powerpc/ioctls.h
@@ -91,6 +91,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -142,10 +124,8 @@
#define TIOCSERCONFIG 0x5453
#define TIOCSERGWILD 0x5454
-Index: linux-2.6.21/include/asm-s390/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-s390/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-s390/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-s390/ioctls.h
++++ b/include/asm-s390/ioctls.h
@@ -56,6 +56,7 @@
#define TIOCGSID 0x5429 /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -154,10 +134,8 @@
#define FIONCLEX 0x5450 /* these numbers need to be adjusted. */
#define FIOCLEX 0x5451
-Index: linux-2.6.21/include/asm-sh/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-sh/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-sh/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-sh/ioctls.h
++++ b/include/asm-sh/ioctls.h
@@ -80,6 +80,7 @@
#define TIOCGSID _IOR('T', 41, pid_t) /* 0x5429 */ /* Return the session ID of FD */
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
@@ -166,10 +144,8 @@
#define TIOCSERCONFIG _IO('T', 83) /* 0x5453 */
#define TIOCSERGWILD _IOR('T', 84, int) /* 0x5454 */
-Index: linux-2.6.21/include/asm-sparc/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-sparc/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-sparc/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-sparc/ioctls.h
++++ b/include/asm-sparc/ioctls.h
@@ -15,6 +15,7 @@
#define TCSETS _IOW('T', 9, struct termios)
#define TCSETSW _IOW('T', 10, struct termios)
@@ -178,10 +154,8 @@
/* Note that all the ioctls that are not available in Linux have a
* double underscore on the front to: a) avoid some programs to
-Index: linux-2.6.21/include/asm-sparc64/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-sparc64/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-sparc64/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-sparc64/ioctls.h
++++ b/include/asm-sparc64/ioctls.h
@@ -16,6 +16,7 @@
#define TCSETS _IOW('T', 9, struct termios)
#define TCSETSW _IOW('T', 10, struct termios)
@@ -190,10 +164,8 @@
/* Note that all the ioctls that are not available in Linux have a
* double underscore on the front to: a) avoid some programs to
-Index: linux-2.6.21/include/asm-x86_64/ioctls.h
-===================================================================
---- linux-2.6.21.orig/include/asm-x86_64/ioctls.h 2007-04-26 05:08:32.000000000 +0200
-+++ linux-2.6.21/include/asm-x86_64/ioctls.h 2007-05-26 09:51:47.000000000 +0200
+--- a/include/asm-x86_64/ioctls.h
++++ b/include/asm-x86_64/ioctls.h
@@ -52,6 +52,7 @@
#define TCSETSF2 _IOW('T',0x2D, struct termios2)
#define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
++++++ patches.kernel.org.tar.bz2 ++++++
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/patch-2.6.22.1-rt8-9 new/patches.rt/patch-2.6.22.1-rt8-9
--- old/patches.rt/patch-2.6.22.1-rt8-9 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.rt/patch-2.6.22.1-rt8-9 2007-07-28 23:40:14.000000000 +0200
@@ -0,0 +1,75 @@
+diff -pruN linux-2.6.22.1-rt8/include/linux/wait.h linux-2.6.22.1-rt9/include/linux/wait.h
+--- linux-2.6.22.1-rt8/include/linux/wait.h 2007-07-08 16:32:17.000000000 -0700
++++ linux-2.6.22.1-rt9/include/linux/wait.h 2007-07-26 11:26:55.000000000 -0700
+@@ -369,12 +369,10 @@ static inline void remove_wait_queue_loc
+ * They are racy. DO NOT use them, use the wait_event* interfaces above.
+ * We plan to remove these interfaces during 2.7.
+ */
+-extern void FASTCALL(sleep_on(wait_queue_head_t *q));
+-extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
+- signed long timeout));
+-extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
+-extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q,
+- signed long timeout));
++extern void sleep_on(wait_queue_head_t *q);
++extern long sleep_on_timeout(wait_queue_head_t *q, long timeout);
++extern void interruptible_sleep_on(wait_queue_head_t *q);
++extern long interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout);
+
+ /*
+ * Waitqueues which are removed from the waitqueue_head at wakeup time
+diff -pruN linux-2.6.22.1-rt8/Makefile linux-2.6.22.1-rt9/Makefile
+--- linux-2.6.22.1-rt8/Makefile 2007-07-26 11:30:07.000000000 -0700
++++ linux-2.6.22.1-rt9/Makefile 2007-07-26 11:26:54.000000000 -0700
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 22
+-EXTRAVERSION = .1-rt8
++EXTRAVERSION = .1-rt9
+ NAME = Holy Dancing Manatees, Batman!
+
+ # *DOCUMENTATION*
+diff -pruN linux-2.6.22.1-rt8/Makefile.rej linux-2.6.22.1-rt9/Makefile.rej
+--- linux-2.6.22.1-rt8/Makefile.rej 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.22.1-rt9/Makefile.rej 2007-07-26 11:26:27.000000000 -0700
+@@ -0,0 +1,17 @@
++***************
++*** 1,7 ****
++ VERSION = 2
++ PATCHLEVEL = 6
++ SUBLEVEL = 22
++- EXTRAVERSION =
++ NAME = Holy Dancing Manatees, Batman!
++
++ # *DOCUMENTATION*
++--- 1,7 ----
++ VERSION = 2
++ PATCHLEVEL = 6
++ SUBLEVEL = 22
+++ EXTRAVERSION = .1
++ NAME = Holy Dancing Manatees, Batman!
++
++ # *DOCUMENTATION*
+diff -pruN linux-2.6.22.1-rt8/net/netfilter/nf_conntrack_proto_sctp.c.rej linux-2.6.22.1-rt9/net/netfilter/nf_conntrack_proto_sctp.c.rej
+--- linux-2.6.22.1-rt8/net/netfilter/nf_conntrack_proto_sctp.c.rej 1969-12-31 16:00:00.000000000 -0800
++++ linux-2.6.22.1-rt9/net/netfilter/nf_conntrack_proto_sctp.c.rej 2007-07-26 11:26:52.000000000 -0700
+@@ -0,0 +1,18 @@
++*************** static int sctp_new(struct nf_conn *conntrack, const struct sk_buff *skb,
++*** 460,466 ****
++ SCTP_CONNTRACK_NONE, sch->type);
++
++ /* Invalid: delete conntrack */
++- if (newconntrack == SCTP_CONNTRACK_MAX) {
++ DEBUGP("nf_conntrack_sctp: invalid new deleting.\n");
++ return 0;
++ }
++--- 460,467 ----
++ SCTP_CONNTRACK_NONE, sch->type);
++
++ /* Invalid: delete conntrack */
+++ if (newconntrack == SCTP_CONNTRACK_NONE ||
+++ newconntrack == SCTP_CONNTRACK_MAX) {
++ DEBUGP("nf_conntrack_sctp: invalid new deleting.\n");
++ return 0;
++ }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.rt/update_extern_sleep_declarations.patch new/patches.rt/update_extern_sleep_declarations.patch
--- old/patches.rt/update_extern_sleep_declarations.patch 2007-07-26 06:46:12.000000000 +0200
+++ new/patches.rt/update_extern_sleep_declarations.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-Subject: 2.6.22.1-rt[78] wait.h extern declarations update
-
-Synchronize extern sleep_on declarations with changes
-to sched.c introduced between 2.6.22.1-rt6 and 2.6.22.1-rt7
-
-signed-off-by: Sven-Thorsten Dietrich
-
-Index: linux-2.6.22/include/linux/wait.h
-===================================================================
---- linux-2.6.22.orig/include/linux/wait.h
-+++ linux-2.6.22/include/linux/wait.h
-@@ -369,12 +369,10 @@ static inline void remove_wait_queue_loc
- * They are racy. DO NOT use them, use the wait_event* interfaces above.
- * We plan to remove these interfaces during 2.7.
- */
--extern void FASTCALL(sleep_on(wait_queue_head_t *q));
--extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q,
-- signed long timeout));
--extern void FASTCALL(interruptible_sleep_on(wait_queue_head_t *q));
--extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q,
-- signed long timeout));
-+extern void sleep_on(wait_queue_head_t *q);
-+extern long sleep_on_timeout(wait_queue_head_t *q, long timeout);
-+extern void interruptible_sleep_on(wait_queue_head_t *q);
-+extern long interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout);
-
- /*
- * Waitqueues which are removed from the waitqueue_head at wakeup time
++++++ patches.suse.tar.bz2 ++++++
++++ 12585 lines of diff (skipped)
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.xen/add-console-use-vt new/patches.xen/add-console-use-vt
--- old/patches.xen/add-console-use-vt 2007-05-26 11:06:27.000000000 +0200
+++ new/patches.xen/add-console-use-vt 2007-08-02 17:24:21.000000000 +0200
@@ -9,8 +9,8 @@
include/linux/console.h | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
---- linux-2.6.21.orig/drivers/char/tty_io.c
-+++ linux-2.6.21/drivers/char/tty_io.c
+--- a/drivers/char/tty_io.c
++++ b/drivers/char/tty_io.c
@@ -133,6 +133,8 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -20,7 +20,7 @@
#ifdef CONFIG_UNIX98_PTYS
extern struct tty_driver *ptm_driver; /* Unix98 pty masters; for /dev/ptmx */
extern int pty_limit; /* Config limit on Unix98 ptys */
-@@ -2574,7 +2576,7 @@ retry_open:
+@@ -2581,7 +2583,7 @@ retry_open:
goto got_driver;
}
#ifdef CONFIG_VT
@@ -29,7 +29,7 @@
extern struct tty_driver *console_driver;
driver = console_driver;
index = fg_console;
-@@ -4041,6 +4043,8 @@ static int __init tty_init(void)
+@@ -4048,6 +4050,8 @@ static int __init tty_init(void)
#endif
#ifdef CONFIG_VT
@@ -38,7 +38,7 @@
cdev_init(&vc0_cdev, &console_fops);
if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-@@ -4048,6 +4052,7 @@ static int __init tty_init(void)
+@@ -4055,6 +4059,7 @@ static int __init tty_init(void)
device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0");
vty_init();
@@ -46,8 +46,8 @@
#endif
return 0;
}
---- linux-2.6.21.orig/include/linux/console.h
-+++ linux-2.6.21/include/linux/console.h
+--- a/include/linux/console.h
++++ b/include/linux/console.h
@@ -63,6 +63,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 */
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-07-27 10:23:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-08-02 20:14:54.356397000 +0200
@@ -192,6 +192,7 @@
patches.fixes/acpi_force-fan-active.patch
patches.suse/apm_setup_UP.diff
+ patches.fixes/hpet_patches_45.patch
########################################################
# Suse specific stuff
@@ -404,6 +405,7 @@
patches.fixes/dm-mpath-hp-sw.patch
patches.suse/dm-emulate-blkrrpart-ioctl
+ patches.suse/dm-raid45-2.6.22.1-20070724.patch
##########################################################
#
@@ -466,6 +468,7 @@
patches.apparmor/apparmor-module_interface.diff
patches.apparmor/apparmor-misc.diff
patches.apparmor/apparmor-intree.diff
+ patches.apparmor/apparmor-network.diff
patches.apparmor/do_path_lookup-nameidata.diff
patches.apparmor/sys_fchdir-nameidata.diff
patches.apparmor/file_permission-nameidata.diff
@@ -678,10 +681,9 @@
+RT patches.rt/patch-2.6.22.1-rt4-5
+RT patches.rt/patch-2.6.22.1-rt5-6
+RT patches.rt/patch-2.6.22.1-rt6-7
-+RT patches.rt/update_extern_sleep_declarations.patch
+RT patches.rt/patch-2.6.22.1-rt7-8
++RT patches.rt/patch-2.6.22.1-rt8-9
+RT patches.rt/preempt_sched_hooks.patch
+RT patches.rt/redeclare_kdb_lock_as_raw.patch
+RT patches.rt/kdb-i386-compile-bugfixes
+RT patches.rt/kdb-memmap-cmd-fixups
-
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org