linux-next: manual merge of the char-misc tree with the devicetree tree

[broonie]

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  include/linux/of.h

between commit:

  82174a0a9c5cf ("of: Move of_device_get_match_data() declaration")

from the devicetree tree and commit:

  673aa1ed1c9b6 ("of: Rename of_modalias_node()")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc include/linux/of.h
index bc2eb39dcf753,9b7a99499ef35..0000000000000
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@@ -370,8 -373,8 +370,9 @@@ extern int of_n_addr_cells(struct devic
  extern int of_n_size_cells(struct device_node *np);
  extern const struct of_device_id *of_match_node(
  	const struct of_device_id *matches, const struct device_node *node);
 +extern const void *of_device_get_match_data(const struct device *dev);
- extern int of_modalias_node(struct device_node *node, char *modalias, int len);
+ extern int of_alias_from_compatible(const struct device_node *node, char *alias,
+ 				    int len);
  extern void of_print_phandle_args(const char *msg, const struct of_phandle_args *args);
  extern int __of_parse_phandle_with_args(const struct device_node *np,
  	const char *list_name, const char *cells_name, int cell_count,