linux-next: manual merge of the tty tree with the devicetree tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in include/linux/of.h between commit 2adfffa22350 ("OF: make of_property_for_each_{u32|string}() use parameters if OF is not enabled") from the devicetree tree and commit 5c19e95216b9 ("OF: Add helper for matching against linux,stdout-path") from the tty tree.

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

Out of interest, why does of_device_is_stdout_path() not return bool?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/of.h
index 90a8811,429e168..0000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -331,7 -337,14 +331,9 @@@ const __be32 *of_prop_next_u32(struct p
   *         printk("String value: %s\n", s);
   */
  const char *of_prop_next_string(struct property *prop, const char *cur);
 -#define of_property_for_each_string(np, propname, prop, s)	\
 -	for (prop = of_find_property(np, propname, NULL),	\
 -		s = of_prop_next_string(prop, NULL);		\
 -		s;						\
 -		s = of_prop_next_string(prop, s))
  
+ int of_device_is_stdout_path(struct device_node *dn);
+ 
  #else /* CONFIG_OF */
  
  static inline const char* of_node_full_name(struct device_node *np)
@@@ -494,20 -507,17 +496,25 @@@ static inline int of_machine_is_compati
  	return 0;
  }
  
 +static inline const __be32 *of_prop_next_u32(struct property *prop,
 +		const __be32 *cur, u32 *pu)
 +{
 +	return NULL;
 +}
 +
 +static inline const char *of_prop_next_string(struct property *prop,
 +		const char *cur)
 +{
 +	return NULL;
 +}
 +
+ static inline int of_device_is_stdout_path(struct device_node *dn)
+ {
+ 	return 0;
+ }
+ 
  #define of_match_ptr(_ptr)	NULL
  #define of_match_node(_matches, _node)	NULL
 -#define of_property_for_each_u32(np, propname, prop, p, u) \
 -	while (0)
 -#define of_property_for_each_string(np, propname, prop, s) \
 -	while (0)
  #endif /* CONFIG_OF */
  
  #ifndef of_node_to_nid

Attachment: pgp00000.pgp
Description: PGP signature