Re: [GIT PULL] gpio: fixes for v5.4-rc1

[Bartosz Golaszewski <brgl@xxxxxxxx>]

wt., 1 paź 2019 o 00:12 Linus Walleij <linus.walleij@xxxxxxxxxx> napisał(a):
>
> On Thu, Sep 19, 2019 at 3:24 PM Bartosz Golaszewski <brgl@xxxxxxxx> 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