diff --git a/[refs] b/[refs]
index 1405327c0608..b608728515ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c032862fba51a3ca504752d3a25186b324c5ce83
+refs/heads/master: 73c30828771acafb0a5e3a1c4cf75e6c5dc5f98a
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index 66f67afad4fa..b3fdf9aee3da 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -687,7 +687,7 @@ choice
 
 config RCU_NOCB_CPU_NONE
 	bool "No build_forced no-CBs CPUs"
-	depends on RCU_NOCB_CPU
+	depends on RCU_NOCB_CPU && !NO_HZ_FULL
 	help
 	  This option does not force any of the CPUs to be no-CBs CPUs.
 	  Only CPUs designated by the rcu_nocbs= boot parameter will be
@@ -695,7 +695,7 @@ config RCU_NOCB_CPU_NONE
 
 config RCU_NOCB_CPU_ZERO
 	bool "CPU 0 is a build_forced no-CBs CPU"
-	depends on RCU_NOCB_CPU
+	depends on RCU_NOCB_CPU && !NO_HZ_FULL
 	help
 	  This option forces CPU 0 to be a no-CBs CPU.  Additional CPUs
 	  may be designated as no-CBs CPUs using the rcu_nocbs= boot
diff --git a/trunk/kernel/time/Kconfig b/trunk/kernel/time/Kconfig
index a2ddd650cb92..e4c07b0692bb 100644
--- a/trunk/kernel/time/Kconfig
+++ b/trunk/kernel/time/Kconfig
@@ -109,7 +109,6 @@ config NO_HZ_FULL
 	select NO_HZ_COMMON
 	select RCU_USER_QS
 	select RCU_NOCB_CPU
-	select RCU_NOCB_CPU_ALL
 	select VIRT_CPU_ACCOUNTING_GEN
 	select CONTEXT_TRACKING_FORCE
 	select IRQ_WORK