Re: linux-next: build failure after merge of the devicetree tree
Dear Stephen Rothwell, On Mon, 26 May 2014 15:05:57 +1000, Stephen Rothwell wrote: > 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; > - Seems like this is in fact reverting my change entirely, so maybe Grant should drop my patch instead? Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: build failure after merge of the devicetree tree
Dear Stephen Rothwell, On Mon, 26 May 2014 15:05:57 +1000, Stephen Rothwell wrote: 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; - Seems like this is in fact reverting my change entirely, so maybe Grant should drop my patch instead? Thanks, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
linux-next: build failure after merge of the devicetree tree
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
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
---
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(>kobj, >attr);
--
2.0.0.rc4
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
signature.asc
Description: PGP signature
linux-next: build failure after merge of the devicetree tree
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 s...@canb.auug.org.au 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 s...@canb.auug.org.au --- 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 Rothwells...@canb.auug.org.au signature.asc Description: PGP signature
