Subject: linux-next: manual merge of the devicetree tree with the devicetree-current tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 Nov 2014 15:05:06 +1100

Hi Grant,

Today's linux-next merge of the devicetree tree got a conflict in
drivers/of/address.c between commit 746c9e9f92dd ("of/base: Fix PowerPC
address parsing hack") from the  tree and commit a0212ae0be5b
("of/address: Don't throw errors on absent ranges properties") from the
devicetree tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/of/address.c
index 06af494184d6,78f02f65fc48..000000000000
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@@ -490,10 -475,12 +490,10 @@@ static int of_translate_one(struct devi
  	 * This code is only enabled on powerpc. --gcl
  	 */
  	ranges = of_get_property(parent, rprop, &rlen);
 -#if !defined(CONFIG_PPC)
 -	if (ranges == NULL) {
 +	if (ranges == NULL && !of_empty_ranges_quirk()) {
- 		pr_err("OF: no ranges; cannot translate\n");
+ 		pr_debug("OF: no ranges; cannot translate\n");
  		return 1;
  	}
 -#endif /* !defined(CONFIG_PPC) */
  	if (ranges == NULL || rlen == 0) {
  		offset = of_read_number(addr, na);
  		memset(addr, 0, pna * 4);