From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tomi Valkeinen <tomi.valkeinen@ti•com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Hans de Goede <hdegoede@redhat•com>
Subject: linux-next: manual merge of the omap_dss2 tree with the pm tree
Date: Mon, 17 Nov 2014 15:16:30 +1100 [thread overview]
Message-ID: <20141117151630.35b22157@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]
Hi Tomi,
Today's linux-next merge of the omap_dss2 tree got a conflict in
include/linux/of.h between commit 8a0662d9ed29 ("Driver core: Unified
interface for firmware node properties") from the pm tree and commit
6d09dc6b74ca ("of.h: Keep extern declaration of of_* variables
when !CONFIG_OF") from the omap_dss2 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/of.h
index 189fc53bc7df,f83ca9dddcba..000000000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -117,16 -112,7 +115,17 @@@ extern struct device_node *of_aliases
extern struct device_node *of_stdout;
extern raw_spinlock_t devtree_lock;
+ #ifdef CONFIG_OF
+static inline bool is_of_node(struct fwnode_handle *fwnode)
+{
+ return fwnode && fwnode->type == FWNODE_OF;
+}
+
+static inline struct device_node *of_node(struct fwnode_handle *fwnode)
+{
+ return fwnode ? container_of(fwnode, struct device_node, fwnode) : NULL;
+}
+
static inline bool of_have_populated_dt(void)
{
return of_allnodes != NULL;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-17 4:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-17 4:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-03-21 2:19 linux-next: manual merge of the omap_dss2 tree with the pm tree Stephen Rothwell
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=20141117151630.35b22157@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rafael.j.wysocki@intel$(echo .)com \
--cc=tomi.valkeinen@ti$(echo .)com \
/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