[GIT,PULL] gpio: fixes for v5.4-rc1
mbox series

Message ID 20190919132403.1835-1-brgl@bgdev.pl
State New
Headers show
Series
  • [GIT,PULL] gpio: fixes for v5.4-rc1
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-v5.4-rc1-fixes-for-linus

Message

Bartosz Golaszewski Sept. 19, 2019, 1:24 p.m. UTC
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

Hi Linus,

please pull the following set of fixes. Two are core code, one is a fix for
a driver. All are stable material.

The following changes since commit 4d856f72c10ecb060868ed10ff1b1453943fc6c8:

  Linux 5.3 (2019-09-15 14:19:32 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-v5.4-rc1-fixes-for-linus

for you to fetch changes up to a94b734a563498ac4b8fff61179a3c2bba781a4e:

  gpio: eic: sprd: Fix the incorrect EIC offset when toggling (2019-09-17 10:08:35 +0200)

----------------------------------------------------------------
gpio: fixes for v5.4-rc1

- fix a bug with emulated open-drain/source where lines' values can no longer
  be changed
- fix getting nonexclusive gpiods from DT
- fix an incorrect offset for the level trigger in gpio-eic-sprd

----------------------------------------------------------------
Bartosz Golaszewski (1):
      gpiolib: don't clear FLAG_IS_OUT when emulating open-drain/open-source

Bruce Chen (1):
      gpio: eic: sprd: Fix the incorrect EIC offset when toggling

Marco Felsch (1):
      gpio: fix getting nonexclusive gpiods from DT

 drivers/gpio/gpio-eic-sprd.c |  7 ++++---
 drivers/gpio/gpiolib.c       | 29 ++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 12 deletions(-)

Comments

Linus Walleij Sept. 30, 2019, 10:11 p.m. UTC | #1
On Thu, Sep 19, 2019 at 3:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:

> please pull the following set of fixes. Two are core code, one is a fix for
> a driver. All are stable material.
>
> The following changes since commit 4d856f72c10ecb060868ed10ff1b1453943fc6c8:
>
>   Linux 5.3 (2019-09-15 14:19:32 -0700)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-v5.4-rc1-fixes-for-linus
>
> for you to fetch changes up to a94b734a563498ac4b8fff61179a3c2bba781a4e:
>
>   gpio: eic: sprd: Fix the incorrect EIC offset when toggling (2019-09-17 10:08:35 +0200)

This doesn't work with v5.4 for some reason:

$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
tags/gpio-v5.4-rc1-fixes-for-linus

remote: Counting objects: 16, done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 16 (delta 7), reused 0 (delta 0)
Unpacking objects: 100% (16/16), done.
From git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
 * tag                         gpio-v5.4-rc1-fixes-for-linus -> FETCH_HEAD
Auto-merging drivers/gpio/gpiolib.c
CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c
Auto-merging drivers/gpio/gpio-eic-sprd.c
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at
least 1294 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

Do you think you could rebase on the v5.4-rc1 and send me a new pull
request? I'm afraid of trying to fix it and screwing up, so would prefer
a rebase.

Yours,
Linus Walleij
Bartosz Golaszewski Oct. 1, 2019, 9:58 a.m. UTC | #2
wt., 1 paź 2019 o 00:12 Linus Walleij <linus.walleij@linaro.org> napisał(a):
>
> On Thu, Sep 19, 2019 at 3:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote:
>
> > please pull the following set of fixes. Two are core code, one is a fix for
> > a driver. All are stable material.
> >
> > The following changes since commit 4d856f72c10ecb060868ed10ff1b1453943fc6c8:
> >
> >   Linux 5.3 (2019-09-15 14:19:32 -0700)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-v5.4-rc1-fixes-for-linus
> >
> > for you to fetch changes up to a94b734a563498ac4b8fff61179a3c2bba781a4e:
> >
> >   gpio: eic: sprd: Fix the incorrect EIC offset when toggling (2019-09-17 10:08:35 +0200)
>
> This doesn't work with v5.4 for some reason:
>
> $ git pull git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git
> tags/gpio-v5.4-rc1-fixes-for-linus
>
> remote: Counting objects: 16, done.
> remote: Compressing objects: 100% (16/16), done.
> remote: Total 16 (delta 7), reused 0 (delta 0)
> Unpacking objects: 100% (16/16), done.
> From git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
>  * tag                         gpio-v5.4-rc1-fixes-for-linus -> FETCH_HEAD
> Auto-merging drivers/gpio/gpiolib.c
> CONFLICT (content): Merge conflict in drivers/gpio/gpiolib.c
> Auto-merging drivers/gpio/gpio-eic-sprd.c
> warning: inexact rename detection was skipped due to too many files.
> warning: you may want to set your merge.renamelimit variable to at
> least 1294 and retry the command.
> Automatic merge failed; fix conflicts and then commit the result.
>
> Do you think you could rebase on the v5.4-rc1 and send me a new pull
> request? I'm afraid of trying to fix it and screwing up, so would prefer
> a rebase.
>

Done. This was due to some functions being moved around during merge window.

Bart

> Yours,
> Linus Walleij