linux-next: manual merge of the pm tree with the arm tree

linux-next: manual merge of the pm tree with the arm tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
arch/arm/mach-shmobile/board-ap4evb.c between commit 9b742024026c ("ARM:
mach-shmobile: Setup consistent dma size at boot time") from the arm tree
and commit 2f82df20d71c ("PM: Move clock-related definitions and headers
to separate file") from the pm tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
index ec8f9d9,4a21a50..0000000
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -42,7 -42,7 +42,8 @@@
  #include <linux/leds.h>
  #include <linux/input/sh_keysc.h>
  #include <linux/usb/r8a66597.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pm_clock.h>
  
  #include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>

Re: linux-next: manual merge of the pm tree with the arm tree

[Rafael J. Wysocki]

On Thursday, August 25, 2011, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> arch/arm/mach-shmobile/board-ap4evb.c between commit 9b742024026c ("ARM:
> mach-shmobile: Setup consistent dma size at boot time") from the arm tree
> and commit 2f82df20d71c ("PM: Move clock-related definitions and headers
> to separate file") from the pm tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks a lot!

Re: linux-next: manual merge of the pm tree with the arm tree

[Rafael J. Wysocki]

[-- Attachment #1: Type: text/plain, Size: 519 bytes --]

On Wednesday, December 03, 2014 12:12:35 PM Stephen Rothwell wrote:
> Hi Rafael,

Hi,

> Today's linux-next merge of the pm tree got a conflict in
> include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
> PM / Runtime: Add getter for querying the IRQ safe option v12") from
> the arm tree and commit 6d14dd40f550 ("PM: Drop CONFIG_PM_RUNTIME from
> the driver core") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks OK to me, thanks!

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the pm tree with the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

Hi Rafael,

Today's linux-next merge of the pm tree got a conflict in
include/linux/pm_runtime.h between commit 3fb1581ea1ab ("ARM: 8199/1:
PM / Runtime: Add getter for querying the IRQ safe option v12") from
the arm tree and commit 6d14dd40f550 ("PM: Drop CONFIG_PM_RUNTIME from
the driver core") from the pm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/linux/pm_runtime.h
index 44d74f0f182e,eda4feede048..000000000000
--- a/include/linux/pm_runtime.h
+++ b/include/linux/pm_runtime.h
@@@ -128,12 -118,14 +118,19 @@@ static inline void pm_runtime_mark_last
  	ACCESS_ONCE(dev->power.last_busy) = jiffies;
  }
  
 +static inline bool pm_runtime_is_irq_safe(struct device *dev)
 +{
 +	return dev->power.irq_safe;
 +}
 +
- #else /* !CONFIG_PM_RUNTIME */
+ #else /* !CONFIG_PM */
+ 
+ static inline bool queue_pm_work(struct work_struct *work) { return false; }
+ 
+ static inline int pm_generic_runtime_suspend(struct device *dev) { return 0; }
+ static inline int pm_generic_runtime_resume(struct device *dev) { return 0; }
+ static inline int pm_runtime_force_suspend(struct device *dev) { return 0; }
+ static inline int pm_runtime_force_resume(struct device *dev) { return 0; }
  
  static inline int __pm_runtime_idle(struct device *dev, int rpmflags)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]