diff --git a/[refs] b/[refs]
index ac839ac4e0e2..ac32036de8b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54514a70adefe356afe854e2d3912d46668068e6
+refs/heads/master: 0e11e342bac31f51ea055b147d20f77b59b9dd2c
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 31d784dd80d0..b0f239e443bc 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -652,6 +652,11 @@ config DEBUG_BLOCK_EXT_DEVT
 	depends on BLOCK
 	default n
 	help
+	  BIG FAT WARNING: ENABLING THIS OPTION MIGHT BREAK BOOTING ON
+	  SOME DISTRIBUTIONS.  DO NOT ENABLE THIS UNLESS YOU KNOW WHAT
+	  YOU ARE DOING.  Distros, please enable this and fix whatever
+	  is broken.
+
 	  Conventionally, block device numbers are allocated from
 	  predetermined contiguous area.  However, extended block area
 	  may introduce non-contiguous block device numbers.  This