r2326 - in trunk/kernel: alpha/kernel-image-2.6.10-alpha-2.6.10/config alpha/kernel-image-2.6.10-alpha-2.6.10/debian amd64/kernel-image-2.6.9-amd64-2.6.9/config amd64/kernel-image-2.6.9-amd64-2.6.9/debian powerpc/kernel-patch-powerpc-2.6.10-2.6.10/config powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian sparc/kernel-image-2.6.9-sparc-2.6.9/config sparc/kernel-image-2.6.9-sparc-2.6.9/debian
Simon Horman
horms@costa.debian.org
Wed, 19 Jan 2005 10:40:19 +0100
Author: horms
Date: 2005-01-19 10:40:17 +0100 (Wed, 19 Jan 2005)
New Revision: 2326
Modified:
trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/generic
trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/smp
trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/debian/changelog
trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/config/default
trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/config/common.stub
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog
trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64-smp
trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog
Log:
Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
Modified: trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/generic
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/generic 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/generic 2005-01-19 09:40:17 UTC (rev 2326)
@@ -309,7 +309,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_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
Modified: trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/smp
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/smp 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/config/smp 2005-01-19 09:40:17 UTC (rev 2326)
@@ -312,7 +312,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_COUNT=16
CONFIG_BLK_DEV_RAM_SIZE=8192
Modified: trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/debian/changelog 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/alpha/kernel-image-2.6.10-alpha-2.6.10/debian/changelog 2005-01-19 09:40:17 UTC (rev 2326)
@@ -1,3 +1,9 @@
+kernel-image-2.6.10-alpha (2.6.10-2) UNRELEASED; urgency=low
+
+ * Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
+
+ -- Simon Horman <horms@debian.org> Wed, 19 Jan 2005 18:38:12 +0900
+
kernel-image-2.6.10-alpha (2.6.10-1) UNRELEASED; urgency=high
* new upstream release
Modified: trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/config/default
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/config/default 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/config/default 2005-01-19 09:40:17 UTC (rev 2326)
@@ -355,7 +355,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=65536
CONFIG_BLK_DEV_INITRD=y
Modified: trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/debian/changelog 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/amd64/kernel-image-2.6.9-amd64-2.6.9/debian/changelog 2005-01-19 09:40:17 UTC (rev 2326)
@@ -1,3 +1,10 @@
+kernel-image-2.6.9-amd64 (2.6.9-7) UNRELEASED; urgency=low
+
+ * Disable CONFIG_BLK_DEV_UB. Just a cosmetic fix to config/default
+ for this image. (See: #284952, #283852) (Simon Horman)
+
+ -- Simon Horman <horms@debian.org> Wed, 19 Jan 2005 18:44:04 +0900
+
kernel-image-2.6.9-amd64 (2.6.9-6) unstable; urgency=low
* Rebuilt with kernel-source-2.6.9 version 2.6.9-5.
Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/config/common.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/config/common.stub 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/config/common.stub 2005-01-19 09:40:17 UTC (rev 2326)
@@ -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.10-2.6.10/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.10-2.6.10/debian/changelog 2005-01-19 09:40:17 UTC (rev 2326)
@@ -1,3 +1,9 @@
+kernel-patch-powerpc-2.6.10 (2.6.10-2) UNRELEASED; urgency=low
+
+ * Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
+
+ -- Simon Horman <horms@debian.org> Wed, 19 Jan 2005 18:28:55 +0900
+
kernel-patch-powerpc-2.6.10 (2.6.10-1) unstable; urgency=low
* New upstream release. (Sven Luther)
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-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.9-2.6.9/debian/changelog 2005-01-19 09:40:17 UTC (rev 2326)
@@ -1,6 +1,6 @@
kernel-patch-powerpc-2.6.9 (2.6.9-5) UNRELEASED; urgency=low
- * Disable CONFIG_BLK_DEV_UB. (See: #284952, #283852) (Simon Horman)
+ * Disable CONFIG_BLK_DEV_UB. (Closes: #284952, #283852) (Simon Horman)
-- Simon Horman <horms@debian.org> Wed, 19 Jan 2005 12:19:23 +0900
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64 2005-01-19 09:40:17 UTC (rev 2326)
@@ -205,7 +205,7 @@
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
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=8192
CONFIG_BLK_DEV_INITRD=y
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64-smp
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64-smp 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/config/sparc64-smp 2005-01-19 09:40:17 UTC (rev 2326)
@@ -206,7 +206,7 @@
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
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=8192
CONFIG_BLK_DEV_INITRD=y
Modified: trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog 2005-01-19 07:03:28 UTC (rev 2325)
+++ trunk/kernel/sparc/kernel-image-2.6.9-sparc-2.6.9/debian/changelog 2005-01-19 09:40:17 UTC (rev 2326)
@@ -1,3 +1,9 @@
+kernel-image-2.6.9-sparc (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 18:36:09 +0900
+
kernel-image-2.6.9-sparc (2.6.9-1) unstable; urgency=low
* New upstream release.