[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20140605141718.07073dd0@canb.auug.org.au>
Date: Thu, 5 Jun 2014 14:17:18 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rob Herring <robherring2@...il.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
Grant Likely <grant.likely@...aro.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>
Subject: Re: [GIT PULL] DeviceTree updates for 3.16
Hi Rob,
On Wed, 4 Jun 2014 11:48:50 -0500 Rob Herring <robherring2@...il.com> wrote:
>
> The correct resolution is keeping the first "if (!of_kset)" and
> dropping the 2nd one as found is no longer present. I'm not sure why,
> but this error doesn't show up in linux-next.
That would be because I did that merge resolution ... I informed Grant
at the time (since it affected his tree).
See https://lkml.kernel.org/r/<20140526150557.219ea08f@...b.auug.org.au>
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)
Powered by blists - more mailing lists