r2672 - in trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10: config debian

[Andres Salomon]

Author: dilinger-guest
Date: 2005-03-11 07:31:07 +0100 (Fri, 11 Mar 2005)
New Revision: 2672

Modified:
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/default
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog
   trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/control
Log:
build against 2.6.10-6, and reenable CONFIG_PREEMPT; don't want to deal w/
the ABINAME bump.  We'll just fix it in 2.6.11, instead.


Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/386	2005-03-11 06:31:07 UTC (rev 2672)
@@ -98,7 +98,7 @@
 CONFIG_X86_F00F_BUG=y
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_HPET_TIMER=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_LOCAL_APIC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686	2005-03-11 06:31:07 UTC (rev 2672)
@@ -105,7 +105,7 @@
 CONFIG_X86_USE_PPRO_CHECKSUM=y
 CONFIG_HPET_TIMER=y
 # CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_LOCAL_APIC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/686-smp	2005-03-11 06:31:07 UTC (rev 2672)
@@ -108,7 +108,7 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/default
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/default	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/default	2005-03-11 06:31:07 UTC (rev 2672)
@@ -105,7 +105,7 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7	2005-03-11 06:31:07 UTC (rev 2672)
@@ -106,7 +106,7 @@
 CONFIG_X86_USE_3DNOW=y
 CONFIG_HPET_TIMER=y
 # CONFIG_SMP is not set
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_LOCAL_APIC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/config/k7-smp	2005-03-11 06:31:07 UTC (rev 2672)
@@ -109,7 +109,7 @@
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
+CONFIG_PREEMPT=y
 CONFIG_X86_LOCAL_APIC=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_TSC=y

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/changelog	2005-03-11 06:31:07 UTC (rev 2672)
@@ -1,9 +1,9 @@
-kernel-image-2.6.10-i386 (2.6.10-5) UNRELEASED; urgency=low
+kernel-image-2.6.10-i386 (2.6.10-6) unstable; urgency=low
 
-  * Disable CONFIG_PREEMPT (Closes: #292061) (Maximilian Attems)
   * Set CONFIG_DVB_AV7110_OSD (Closes: #291689) (Maximilian Attems)
+  * Build against 2.6.10-6 (Andres Salomon).
 
- -- DONT RELEASE WITHOUT REVVING SONAME
+ -- Andres Salomon <dilinger@voxel.net>  Fri, 11 Mar 2005 01:30:10 -0500
 
 kernel-image-2.6.10-i386 (2.6.10-4) unstable; urgency=low
 

Modified: trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/control
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/control	2005-03-11 06:01:48 UTC (rev 2671)
+++ trunk/kernel/i386/kernel-image-2.6.10-i386-2.6.10/debian/control	2005-03-11 06:31:07 UTC (rev 2672)
@@ -4,7 +4,7 @@
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Uploaders: William Lee Irwin III <wli@debian.org>, Andres Salomon <dilinger@debian.org>, Simon Horman <horms@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.10-4, module-init-tools
+Build-Depends: debhelper (>= 2), kernel-package (>= 8.054), kernel-tree-2.6.10-6, module-init-tools
 
 Package: kernel-headers-2.6.10-1
 Architecture: i386