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

[Frederik Schüler]

Author: fschueler-guest
Date: Sun Dec  4 12:32:10 2005
New Revision: 4967

Modified:
   dists/trunk/linux-2.6/debian/arch/i386/config.386
   dists/trunk/linux-2.6/debian/changelog
Log:
Drop M386 support remains from the i386 386 flavour: built with M486 from now on.
Update Changelog.
Prepare for release to experimental.


Modified: dists/trunk/linux-2.6/debian/arch/i386/config.386
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.386	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.386	Sun Dec  4 12:32:10 2005
@@ -1,5 +1,5 @@
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_M386=y
+CONFIG_M486=y
 # CONFIG_M686 is not set
 # CONFIG_MK7 is not set
 CONFIG_X86_GENERIC=y
@@ -102,3 +102,12 @@
 CONFIG_EXT2_FS=y
 CONFIG_FS_MBCACHE=y
 CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_M386 is not set
+CONFIG_X86_POPAD_OK=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_XADD=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_ALIGNMENT_16=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_WP_WORKS_OK=y

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec  4 12:32:10 2005
@@ -5,7 +5,14 @@
   * 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.
+  * clean up debian-patches dir: remove all obsolete patches:
+    - alpha-compile-fix.patch: obsolete
+    - amd64-int3-fix.patch: fixed since 2.6.12
+    - net-ipconntrack-nat-fix.patch: merged upstream after 2.6.14 release
+    - net-nf_queue-oops.patch: merged upstream after 2.6.14 release
+    - qla2xxx-removed.patch: obsolete
+  * Drop M386 support remains from the i386 386 flavour: built with M486 
+    from now on.
 
   [ Simon Horman ]
   * Enable MKISS globally (closes: #340215)
@@ -25,7 +32,7 @@
     shutdown on some sparc machines with serial console. Proper fix has
     been incorporated upstream.
 
- -- Frederik Schüler <fs at debian.org>  Thu,  1 Dec 2005 22:13:02 +0000
+ -- Frederik Schüler <fs at debian.org>  Sun,  4 Dec 2005 12:31:04 +0000
 
 linux-2.6 (2.6.14-3) unstable; urgency=low