linux-kernel - linux-next: manual merge of the omap

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 17 Nov 2014 15:16:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tomi Valkeinen <tomi.valkeinen@...com>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Hans de Goede <hdegoede@...hat.com>
Subject: linux-next: manual merge of the omap_dss2 tree with the pm tree

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@...b.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;

Content of type "application/pgp-signature" skipped