Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 9 Sep 2019 19:00:50 -0400
From:   Brian Masney <masneyb@onstation.org>
To:     Arnd Bergmann <arnd@arndb.de>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        Bartosz Golaszewski <bgolaszewski@baylibre.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Hulk Robot <hulkci@huawei.com>,
        YueHaibing <yuehaibing@huawei.com>,
        Hans Verkuil <hans.verkuil@cisco.com>,
        Stephen Boyd <swboyd@chromium.org>,
        Enrico Weigelt <info@metux.net>,
        Johan Hovold <johan@kernel.org>, linux-gpio@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] gpio: fix incorrect merge of linux/gpio/driver.h
Message-ID: <20190909230050.GA5181@onstation.org>
References: <20190909203512.675822-1-arnd@arndb.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20190909203512.675822-1-arnd@arndb.de>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Mon, Sep 09, 2019 at 10:34:59PM +0200, Arnd Bergmann wrote:
> Two otherwise correct patches got merged incorrectly, which leads to
> build problems when CONFIG_GPIOLIB is disabled:
> 
> include/linux/gpio/driver.h:722:19: error: static declaration of 'gpiochip_lock_as_irq' follows non-static declaration
> static inline int gpiochip_lock_as_irq(struct gpio_chip *chip,
>                   ^
> include/linux/gpio/driver.h:706:5: note: previous declaration is here
> int gpiochip_lock_as_irq(struct gpio_chip *chip, unsigned int offset);
>     ^
> include/linux/gpio/driver.h:729:20: error: static declaration of 'gpiochip_unlock_as_irq' follows non-static declaration
> static inline void gpiochip_unlock_as_irq(struct gpio_chip *chip,
>                    ^
> include/linux/gpio/driver.h:707:6: note: previous declaration is here
> void gpiochip_unlock_as_irq(struct gpio_chip *chip, unsigned int offset);
> 
> Fixes: 8a6abcd04e4c ("Merge tag 'gpio-v5.4-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel")
> Fixes: 9091373ab7ea ("gpio: remove less important #ifdef around declarations")
> Fixes: c7663fa2a663 ("gpio: Move gpiochip_lock/unlock_as_irq to gpio/driver.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Brian Masney <masneyb@onstation.org>