Two new breakages since Thursday

[tony@atomide.com (Tony Lindgren)]

* Tony Lindgren <tony@atomide.com> [150414 08:13]:
> * Arnd Bergmann <arnd@arndb.de> [150414 08:00]:
> > On Tuesday 14 April 2015 07:28:47 Tony Lindgren wrote:
> > > > I managed to catch up with my email last night and pulled in these two fixes
> > > > as well as a number of others that we had neglected over the last two weeks.
> > > > 
> > > > I found one new regression with the overnight build tests in a branch I pulled
> > > > in as 'next/late' from Tony, and backed that out now. I'll wait for you and
> > > > Stephen Rothwell (who also reported these issues) to confirm that it's ok
> > > > now and we'll hopefully be ready to send pull requests by the end of the
> > > > week.
> > > 
> > > Hmm what's this issue you're mentioning here for the next/late? Is it the
> > > merge conflict with camera related changes fixed up by Stephen Rothwell
> > > in next?
> > > 
> > > 
> > 
> > This is the error I get during 'make dtbs':
> > 
> >   DTC     arch/arm/boot/dts/am3517_mt_ventoux.dtb
> > ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"
> > 
> > The problem is evidently commit b8845074cfbbd ("ARM: dts: omap3: add
> > minimal l4 bus layout with control module support"), which for some reason
> > removes the tisyscon at 48002270 node that is still referenced through
> > the &omap3_scm_general label from omap34xx.dtsi and omap36xx.dtsi.
> 
> I believe this issue got introduced on the 7th by the camera patches
> I acked earlier.

Actually, investigating it further, looks like my for-next branch is
missing my omap-for-v4.1/dt-v2 branch already merged into arm-soc
for-next.. Sorry about that, this merge conflict could have been
avoided if I had not missed that branch when rebuilding my for-next.

Anyways, Stephen's resolve below is correct. Arnd, I suggest you
remerge it with --no-commit and apply Stephen's resolution below
manually.

Regards,

Tony

> Stephen has been carrying this fix in next:
> 
> https://lkml.org/lkml/2015/4/6/436
> 
> The problem was we had two different SCM dts entries.. So with Tero's
> changes we've now standardized on scm_conf.