From: Grant Likely <grant.likely@linaro.org>
Date: Mon, 24 Nov 2014 14:50:07 +0000 (+0000)
Subject: Merge tag 'v3.18-rc6' into devicetree/next
X-Git-Tag: v4.14-rc1~6337^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'v3.18-rc6' into devicetree/next

v3.18-rc6 contains an important DT bug fix, c1a2086e2d, "of/selftest:
Fix off-by-one error in removal path" which affects testing of the
overlay patch series. Merge it into the devicetree/next staging branch
so that the overlay patches are applied on top of a known working tree.

Linux 3.18-rc6

Conflicts:
	drivers/of/address.c
---

66e6a5a1fcd2f3e05f4d499b539a1f77ceb52d1d
diff --cc drivers/of/address.c
index 78f02f6,06af494..ad29069
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@@ -475,12 -490,10 +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);