diff --git a/[refs] b/[refs]
index 1e38077e2443..f640dc6e438f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fbc42eac1f6917081dc3b39922b2f1c57fdff28
+refs/heads/master: 8b43876643a737bb74a0e1e557f634eb2453948b
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 22616cd434bc..8a1dac2f80a9 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -509,6 +509,7 @@ config RCU_USER_QS
 config CONTEXT_TRACKING_FORCE
 	bool "Force context tracking"
 	depends on CONTEXT_TRACKING
+	default CONTEXT_TRACKING
 	help
 	  Probe on user/kernel boundaries by default in order to
 	  test the features that rely on it such as userspace RCU extended