Hi Grant, After merging the devicetree tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/of/base.c: In function 'of_update_property': drivers/of/base.c:1906:10: error: 'found' undeclared (first use in this function) return found ? 0 : -ENODEV; ^ Caused by a bad automatic merge resolution between commits 582da6527da3 ("of: make of_update_property() usable earlier in the boot process") (merged into Linus' tree between v3.15-rc4 and rc5) and 947fdaad0627 ("of: fix race between search and remove in of_update_property()") from the devicetree tree. I have added the following merge fix patch: From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Date: Mon, 26 May 2014 14:50:40 +1000 Subject: [PATCH] of: fix bad merge of drivers/of/base.c Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> --- drivers/of/base.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 395ee2b3146d..03e7fc6c93e8 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1901,10 +1901,6 @@ int of_update_property(struct device_node *np, struct property *newprop) if (!of_kset) return 0; - /* At early boot, bail out and defer setup to of_init() */ - if (!of_kset) - return found ? 0 : -ENODEV; - /* Update the sysfs attribute */ if (oldprop) sysfs_remove_bin_file(&np->kobj, &oldprop->attr); -- 2.0.0.rc4 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature