From: Kevin Hilman <khilman@baylibre.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Carlo Caione <carlo@caione.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Deepak <deepak_das@mentor.com>
Subject: Re: linux-next: manual merge of the amlogic tree with the pinctrl tree
Date: Thu, 15 Sep 2016 14:18:01 -0700 [thread overview]
Message-ID: <7h60pwlv5i.fsf@baylibre.com> (raw)
In-Reply-To: <CACRpkdZnovdXWdm3udHXtfobPUiovTTSJ5WOKKw+QrSVp+GpHA@mail.gmail.com> (Linus Walleij's message of "Thu, 15 Sep 2016 14:22:40 +0200")
Linus Walleij <linus.walleij@linaro.org> writes:
> On Thu, Sep 15, 2016 at 2:19 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> 23b4ed268076 ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
>>
>> from the pinctrl tree and commit:
>>
>> eb4ec68acf5e ("driver: base: pinctrl: return error from pinctrl_bind_pins()")
>>
>> from the amlogic tree.
>
> That should not be in the amlogic tree.
>
> Carlo, Deepak etc: Please make sure it goes away from there.
It in the amlogic tree because I merged your pinctrl/devel into my
integration branch for testing, but appears the one I merged was
out-dated. Fixed.
Kevin
prev parent reply other threads:[~2016-09-15 21:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 0:19 linux-next: manual merge of the amlogic tree with the pinctrl tree Stephen Rothwell
2016-09-15 12:22 ` Linus Walleij
2016-09-15 21:18 ` Kevin Hilman [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=7h60pwlv5i.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=carlo@caione.org \
--cc=deepak_das@mentor.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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