From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Herring <robherring2@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Grant Likely <grant.likely@linaro.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [GIT PULL] DeviceTree updates for 3.16
Date: Thu, 5 Jun 2014 14:17:18 +1000 [thread overview]
Message-ID: <20140605141718.07073dd0@canb.auug.org.au> (raw)
In-Reply-To: <CAL_JsqKPJzzR-Thvnd7Fw5aTymxvQBp+bf8sdmGfL-xHM+iJ-Q@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
Hi Rob,
On Wed, 4 Jun 2014 11:48:50 -0500 Rob Herring <robherring2@gmail.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@canb.auug.org.au>
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2014-06-05 4:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 16:48 Rob Herring
2014-06-05 4:17 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140605141718.07073dd0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=devicetree@vger.kernel.org \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robherring2@gmail.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®