[kernel] r4952 - in dists/trunk/linux-2.6/debian: . arch/i386

[Frederik Schüler]

Author: fschueler-guest
Date: Fri Dec  2 11:00:12 2005
New Revision: 4952

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
   dists/trunk/linux-2.6/debian/changelog
Log:
Update i386 configs.


Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri Dec  2 11:00:12 2005
@@ -1904,3 +1904,11 @@
 CONFIG_SBC8360_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_I6300ESB_WDT=m
+CONFIG_X86_32=y
+CONFIG_BLK_DEV_CS5535=m
+CONFIG_PM_LEGACY=y
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	Fri Dec  2 11:00:12 2005
@@ -83,3 +83,4 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_CMPXCHG64=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	Fri Dec  2 11:00:12 2005
@@ -69,3 +69,4 @@
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7	Fri Dec  2 11:00:12 2005
@@ -84,3 +84,4 @@
 CONFIG_FS_MBCACHE=m
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_X86_CMPXCHG64=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	Fri Dec  2 11:00:12 2005
@@ -70,3 +70,4 @@
 CONFIG_X86_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_CMPXCHG64=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec  2 11:00:12 2005
@@ -1,18 +1,14 @@
-linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.14+2.6.15-rc4-0experimental.1) experimental; urgency=low
 
   [ Frederik Schüler ]
   * New upstream release candidate.
   * Readdition of qla2xxx drivers, as firmware license has been fixed.
   * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
     statically linked has better performance then modules due to TLB issue.
+  * clean up debian-patches dir: remove all obsolete patches.
 
   [ Simon Horman ]
   * Enable MKISS globally (closes: #340215)
-
-  [ Sven Luther ]
-  * [powerpc] Now use ARCH=powerpc for both 32bit and 64bit powerpc flavours.
-
-  [ Simon Horman ]
   * Add recommends libc6-i686 to 686 and k7 image packages
     (closes: #278729)
   * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
@@ -21,12 +17,15 @@
     possibly soon if it proves to be a source of bugs.
     (closes: #340388)
 
+  [ Sven Luther ]
+  * [powerpc] Now use ARCH=powerpc for both 32bit and 64bit powerpc flavours.
+
   [ Jurij Smakov ]
   * Drop tty-locking-fixes9.patch, which was preventing the oops during
     shutdown on some sparc machines with serial console. Proper fix has
     been incorporated upstream.
 
- -- Simon Horman <horms at verge.net.au>  Wed, 30 Nov 2005 16:42:57 +0900
+ -- Frederik Schüler <fs at debian.org>  Thu,  1 Dec 2005 22:13:02 +0000
 
 linux-2.6 (2.6.14-3) unstable; urgency=low