r1054 - in trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26: config debian

Simon Horman horms@haydn.debian.org
Thu, 12 Aug 2004 19:56:08 -0600


Author: horms
Date: 2004-08-12 19:56:05 -0600 (Thu, 12 Aug 2004)
New Revision: 1054

Modified:
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/386
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/586tsc
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686-smp
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/default
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k6
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7-smp
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
   trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control
Log:
Build against kernel-tree 2.4.26-6

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/386
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/386	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/386	2004-08-13 01:56:05 UTC (rev 1054)
@@ -326,6 +326,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/586tsc
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/586tsc	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/586tsc	2004-08-13 01:56:05 UTC (rev 1054)
@@ -333,6 +333,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686	2004-08-13 01:56:05 UTC (rev 1054)
@@ -335,6 +335,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686-smp
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686-smp	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/686-smp	2004-08-13 01:56:05 UTC (rev 1054)
@@ -336,6 +336,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/default
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/default	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/default	2004-08-13 01:56:05 UTC (rev 1054)
@@ -172,6 +172,7 @@
 # CONFIG_MD_MULTIPATH is not set
 # CONFIG_BLK_DEV_LVM is not set
 # CONFIG_BLK_DEV_DM is not set
+# CONFIG_BLK_DEV_DM_MIRROR is not set
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k6
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k6	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k6	2004-08-13 01:56:05 UTC (rev 1054)
@@ -328,6 +328,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7	2004-08-13 01:56:05 UTC (rev 1054)
@@ -335,6 +335,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7-smp
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7-smp	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/config/k7-smp	2004-08-13 01:56:05 UTC (rev 1054)
@@ -336,6 +336,7 @@
 CONFIG_MD_MULTIPATH=m
 CONFIG_BLK_DEV_LVM=m
 CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM_MIRROR=m
 
 #
 # Networking options

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/changelog	2004-08-13 01:56:05 UTC (rev 1054)
@@ -1,4 +1,4 @@
-kernel-image-2.4.26-i386 (2.4.26-5) unstable; urgency=low
+kernel-image-2.4.26-i386 (2.4.26-6) UNRELEASED; urgency=low
 
   * Added myself (Simon Horman <horms@debian.org>) to the list of uploaders,
     as I seem to have missed it the first time around.
@@ -10,8 +10,9 @@
     completely breaks parallised builds as files can be zeroed as the
     customised touch command tries to make a fresh copy of a file while
     another process tries to do the same.
+  * Build against kernel-tree 2.4.26-6 (closes: #253871)
 
- -- Simon Horman <horms@debian.org>  Thu, 29 Jul 2004 10:54:45 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 29 Jul 2004 19:12:16 +0900
 
 kernel-image-2.4.26-i386 (2.4.26-4) unstable; urgency=low
 

Modified: trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control
===================================================================
--- trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control	2004-08-13 01:47:00 UTC (rev 1053)
+++ trunk/kernel-2.4/i386/kernel-image-2.4.26-i386-2.4.26/debian/control	2004-08-13 01:56:05 UTC (rev 1054)
@@ -4,7 +4,7 @@
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: William Irwin <wli@debian.org>, Martin Michlmayr <tbm@debian.org>, Sven Luther <luther@debian.org>, Jens Schmalzing <jensen@debian.org>, Jeff Bailey <jbailey@debian.org>, Dann Frazier <dannf@debian.org>, Simon Horman <horms@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 2), modutils, kernel-tree-2.4.26-4, kernel-package (>= 8.042)
+Build-Depends: debhelper (>= 2), modutils, kernel-tree-2.4.26-6, kernel-package (>= 8.042)
 
 Package: kernel-headers-2.4.26-1
 Architecture: i386