Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
index 78af6d8cf2e2..daf2753de7aa 100644
--- a/arch/arm/mach-omap2/powerdomain.c
+++ b/arch/arm/mach-omap2/powerdomain.c
@@ -186,8 +186,9 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
                         trace_state = (PWRDM_TRACE_STATES_FLAG |
                                        ((next & OMAP_POWERSTATE_MASK) << 8) |
                                        ((prev & OMAP_POWERSTATE_MASK) << 0));
-                        trace_power_domain_target(pwrdm->name, trace_state,
-                                                  smp_processor_id());
+                        trace_power_domain_target_rcuidle(pwrdm->name,
+                                                          trace_state,
+                                                          smp_processor_id());
                 }
                 break;
         default:
@@ -523,8 +524,8 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
 
         if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {
                 /* Trace the pwrdm desired target state */
-                trace_power_domain_target(pwrdm->name, pwrst,
-                                          smp_processor_id());
+                trace_power_domain_target_rcuidle(pwrdm->name, pwrst,
+                                                  smp_processor_id());
                 /* Program the pwrdm desired target state */
                 ret = arch_pwrdm->pwrdm_set_next_pwrst(pwrdm, pwrst);
         }