Today's -next is failing to build for me because commit 9f419c (PM /Domains: Add preliminary support for cpuidle) and commit b32e30(cpuidle: move field disable from per-driver to per-cpu) disagree aboutwhere the disable field should be:

CC drivers/base/power/domain.odrivers/base/power/domain.c: In function '__pm_genpd_poweron':drivers/base/power/domain.c:194: error: 'struct cpuidle_state' has no member named 'disable'drivers/base/power/domain.c: In function 'pm_genpd_poweroff':drivers/base/power/domain.c:490: error: 'struct cpuidle_state' has no member named 'disable'drivers/base/power/domain.c: In function 'genpd_attach_cpuidle':drivers/base/power/domain.c:1671: error: 'struct cpuidle_state' has no member named 'disable'drivers/base/power/domain.c: In function 'genpd_detach_cpuidle':drivers/base/power/domain.c:1706: error: 'struct cpuidle_state' has no member named 'disable'