diff --git a/[refs] b/[refs]
index 9767509ddb3c..47e7ed0e9017 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 359346a9655c8800408ed3ca44517ac7ea95c197
+refs/heads/master: 7788fae6cce616fe2c624273fcfe54cf50f5c38b
diff --git a/trunk/fs/xfs/Kconfig b/trunk/fs/xfs/Kconfig
index 524021ff5436..3f53dd101f99 100644
--- a/trunk/fs/xfs/Kconfig
+++ b/trunk/fs/xfs/Kconfig
@@ -64,3 +64,16 @@ config XFS_RT
 	  See the xfs man page in section 5 for additional information.
 
 	  If unsure, say N.
+
+config XFS_DEBUG
+	bool "XFS Debugging support (EXPERIMENTAL)"
+	depends on XFS_FS && EXPERIMENTAL
+	help
+	  Say Y here to get an XFS build with many debugging features,
+	  including ASSERT checks, function wrappers around macros,
+	  and extra sanity-checking functions in various code paths.
+
+	  Note that the resulting code will be HUGE and SLOW, and probably
+	  not useful unless you are debugging a particular problem.
+
+	  Say N unless you are an XFS developer, or you play one on TV.