From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Petazzoni Subject: Re: linux-next: build failure after merge of the devicetree tree Date: Mon, 26 May 2014 09:22:37 +0200 Message-ID: <20140526092237.24631389@free-electrons.com> References: <20140526150557.219ea08f@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from top.free-electrons.com ([176.31.233.9]:35357 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751547AbaEZHWl (ORCPT ); Mon, 26 May 2014 03:22:41 -0400 In-Reply-To: <20140526150557.219ea08f@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Grant Likely , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Xiubo Li 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