Re: linux-next: manual merge of the pm tree with the arm tree
From: Rafael J. Wysocki
Date: Tue Dec 02 2014 - 20:24:25 EST
On Wednesday, December 03, 2014 12:12:35 PM Stephen Rothwell wrote:
> 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).
Looks OK to me, thanks!
Description: This is a digitally signed message part.