Hi Rafael, After merging the pm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/sec-core.c: In function 'sec_pmic_suspend': drivers/mfd/sec-core.c:438:29: error: 'PM_SUSPEND_MEM' undeclared (first use in this function) regulator_suspend_prepare(PM_SUSPEND_MEM); ^ Caused by commit bb3274b6442d ("PM / sleep: Rename symbols, functions and variables related to sleep") interacting with commit b7cde7078d23 ("mfd: sec-core: Prepare regulators for suspend state to reduce power-consumption") from Linus' tree. I applied the following merge fix patch: From: Stephen Rothwell Date: Mon, 11 Aug 2014 11:55:23 +1000 Subject: [PATCH] PM / sleep: fix for Rename symbols, functions and variables related to sleep Signed-off-by: Stephen Rothwell --- drivers/mfd/sec-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index dba7e2b6f8e9..d289dc5fef66 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -435,7 +435,7 @@ static int sec_pmic_suspend(struct device *dev) switch (sec_pmic->device_type) { case S2MPS14X: case S2MPU02: - regulator_suspend_prepare(PM_SUSPEND_MEM); + regulator_suspend_prepare(PM_SUSPEND_DEEP); break; default: break; -- 2.1.0.rc1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au