From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Rafael J. Wysocki" <rjw@rjwysocki•net>,
Russell King <linux@arm•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Krzysztof Kozlowski <k.kozlowski@samsung•com>
Subject: linux-next: manual merge of the pm tree with the arm tree
Date: Wed, 3 Dec 2014 12:12:35 +1100 [thread overview]
Message-ID: <20141203121235.3eabd77b@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-12-03 1:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-03 1:12 Stephen Rothwell [this message]
2014-12-03 1:45 ` linux-next: manual merge of the pm tree with the arm tree Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2011-08-25 3:30 Stephen Rothwell
2011-08-25 14:28 ` Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141203121235.3eabd77b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=k.kozlowski@samsung$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
--cc=rjw@rjwysocki$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox