I aldready fixed this up in my tree. On Thu, Sep 5, 2019 at 4:04 AM Yuehaibing <yuehaibing@xxxxxxxxxx> 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
Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
- Subject: Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
- From: Linus Walleij <linus.walleij@xxxxxxxxxx>
- Date: Thu, 5 Sep 2019 11:36:14 +0200
- In-reply-to: <23aeaa05-3a59-5f01-7a67-de1d1d1de547@huawei.com>
- References: <20190822031817.32888-1-yuehaibing@huawei.com> <CACRpkdapgDbkm3JjywtPv=5gYKQCCXzdabDumVukFv5Dn5pomA@mail.gmail.com> <20190904154631.kjegnsk6cf473nr6@flow> <23aeaa05-3a59-5f01-7a67-de1d1d1de547@huawei.com>
- References:
- [PATCH] gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h
- From: YueHaibing
- Re: [PATCH] gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h
- From: Linus Walleij
- [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
- From: Sebastian Andrzej Siewior
- Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
- From: Yuehaibing
- [PATCH] gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h
- Prev by Date: Re: [PATCH 3/3] Revert "pinctrl: sh-pfc: r8a77990: Fix MOD_SEL1 bit31 when using SIM0_D"
- Next by Date: [PATCH] gpio: Fix up merge collision in include file
- Previous by thread: Re: [PATCH] gpio: Move gpiochip_.*lock_as_irq() to the proper ifdef
- Next by thread: [PATCH v1] MAINTAINERS: Remove staled record for gpio-intel-mid.c
- Index(es):
 |