r2325 - in trunk/kernel: ia64/kernel-image-2.6.9-ia64-2.6.9/config ia64/kernel-image-2.6.9-ia64-2.6.9/debian powerpc/kernel-patch-powerpc-2.6.9-2.6.9/config powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian

[Simon Horman]

Author: horms
Date: 2005-01-19 08:03:28 +0100 (Wed, 19 Jan 2005)
New Revision: 2325

Modified:
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/default
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium-smp
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley-smp
   trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/config/common.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
Log:
* Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/default
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/default	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/default	2005-01-19 07:03:28 UTC (rev 2325)
@@ -317,7 +317,7 @@
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_INITRD=y

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium	2005-01-19 07:03:28 UTC (rev 2325)
@@ -317,7 +317,7 @@
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_INITRD=y

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium-smp	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/itanium-smp	2005-01-19 07:03:28 UTC (rev 2325)
@@ -317,7 +317,7 @@
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_INITRD=y

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley	2005-01-19 07:03:28 UTC (rev 2325)
@@ -317,7 +317,7 @@
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_INITRD=y

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley-smp
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley-smp	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/config/mckinley-smp	2005-01-19 07:03:28 UTC (rev 2325)
@@ -317,7 +317,7 @@
 CONFIG_BLK_DEV_CRYPTOLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=32768
 CONFIG_BLK_DEV_INITRD=y

Modified: trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/debian/changelog	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/ia64/kernel-image-2.6.9-ia64-2.6.9/debian/changelog	2005-01-19 07:03:28 UTC (rev 2325)
@@ -1,3 +1,9 @@
+kernel-image-2.6.9-ia64 (2.6.9-5) UNRELEASED; urgency=low
+
+  * Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Wed, 19 Jan 2005 12:16:17 +0900
+
 kernel-image-2.6.9-ia64 (2.6.9-4) unstable; urgency=low
 
   * Link keyboard drivers statically.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/config/common.stub	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/config/common.stub	2005-01-19 07:03:28 UTC (rev 2325)
@@ -217,7 +217,7 @@
 # CONFIG_BLK_DEV_IDEDMA_FORCED is not set
 CONFIG_IDEDMA_PCI_AUTO=y
 # CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_UB=m
+# CONFIG_BLK_DEV_UB is not set
 CONFIG_BLK_DEV_AEC62XX=m
 # CONFIG_BLK_DEV_ALI15X3 is not set
 # CONFIG_BLK_DEV_AMD74XX is not set

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog	2005-01-18 15:14:38 UTC (rev 2324)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog	2005-01-19 07:03:28 UTC (rev 2325)
@@ -1,3 +1,9 @@
+kernel-patch-powerpc-2.6.9 (2.6.9-5) UNRELEASED; urgency=low
+
+  * Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
+
+ -- Simon Horman <horms@debian.org>  Wed, 19 Jan 2005 12:19:23 +0900
+
 kernel-patch-powerpc-2.6.9 (2.6.9-4) unstable; urgency=high
 
   * Rebuilt against kernel-source-2.6.9-5 (Sven Luther) :