From: Ray Jui <rjui@broadcom.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: "linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
Johan Hovold <johan@kernel.org>,
Alexandre Courbot <acourbot@nvidia.com>,
Michael Welling <mwelling@ieee.org>,
Markus Pargmann <mpa@pengutronix.de>,
bcm-kernel-feedback-list <bcm-kernel-feedback-list@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Jon Mason <jonmason@broadcom.com>
Subject: Re: [PATCH 090/182] pinctrl: cygnus-gpio: use gpiochip data pointer
Date: Mon, 14 Dec 2015 09:01:25 -0800 [thread overview]
Message-ID: <566EF5E5.9070305@broadcom.com> (raw)
In-Reply-To: <CACRpkdbSDCdQJvDUyvYo9-HRbh66XRYNMH7VdFLPARqgTK_mBw@mail.gmail.com>
On 12/13/2015 3:27 AM, Linus Walleij wrote:
> On Wed, Dec 9, 2015 at 6:06 PM, Ray Jui <rjui@broadcom.com> wrote:
>
>> The change itself looks fine to me. But I thought the previous patchset from
>> Pramod changes the file name, all the function names and macros from
>> "cygnus" to "iproc" and have been merged by you?
>>
>> Shouldn't this patch be developed on top of that? Or am I missing something?
>
> Merge conflicts is a fact of life. I am merging this change to the GPIO
> tree and the other stuff is merged to the pinctrl tree.
>
> That said I think that git copes with this kind of stuff. And if it doesn't,
> I will maybe merge the trees into one for this merge window, just to make
> things easier.
>
> Yours,
> Linus Walleij
>
Okay. As it is this change looks good to me!
Acked-by: Ray Jui <rjui@broadcom.com>
Thanks!
Ray
prev parent reply other threads:[~2015-12-14 17:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:29 [PATCH 090/182] pinctrl: cygnus-gpio: use gpiochip data pointer Linus Walleij
2015-12-09 17:06 ` Ray Jui
2015-12-13 11:27 ` Linus Walleij
2015-12-14 17:01 ` Ray Jui [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=566EF5E5.9070305@broadcom.com \
--to=rjui@broadcom.com \
--cc=acourbot@nvidia.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=johan@kernel.org \
--cc=jonmason@broadcom.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mpa@pengutronix.de \
--cc=mwelling@ieee.org \
--cc=sbranden@broadcom.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.