From: Linus Walleij <linus.walleij@linaro.org>
To: Yuehaibing <yuehaibing@huawei.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Alexandre Courbot <acourbot@nvidia.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"open list:GPIO SUBSYSTEM" <linux-gpio@vger.kernel.org>,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
Date: Thu, 5 Sep 2019 11:36:14 +0200 [thread overview]
Message-ID: <CACRpkdZcfRnvSGGfpiR=Kb6TDJQjtcQJ4ikhaFC4oB8ZP35+aQ@mail.gmail.com> (raw)
In-Reply-To: <23aeaa05-3a59-5f01-7a67-de1d1d1de547@huawei.com>
I aldready fixed this up in my tree.
On Thu, Sep 5, 2019 at 4:04 AM Yuehaibing <yuehaibing@huawei.com> wrote:
> Interesting, my patch indeed do the correct thing:
It is a classic merge collision. Something fun for the subsystem
maintainer to deal with :D
Yours,
Linus Walleij
prev parent reply other threads:[~2019-09-05 9:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 3:18 [PATCH] gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h YueHaibing
2019-08-23 10:00 ` Linus Walleij
2019-09-04 15:46 ` [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef Sebastian Andrzej Siewior
2019-09-05 2:04 ` Yuehaibing
2019-09-05 9:36 ` Linus Walleij [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='CACRpkdZcfRnvSGGfpiR=Kb6TDJQjtcQJ4ikhaFC4oB8ZP35+aQ@mail.gmail.com' \
--to=linus.walleij@linaro.org \
--cc=acourbot@nvidia.com \
--cc=bgolaszewski@baylibre.com \
--cc=bigeasy@linutronix.de \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=yuehaibing@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).