| Message ID | YD9K8LzSFpuAhDvW@black.fi.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] intel-gpio for 5.12-2 | expand |
On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Hi Linux GPIO and ACPI maintainers, > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > PR is to both subsystems. > > Thanks, > > With Best Regards, > Andy Shevchenko > > The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: > > Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) > > are available in the Git repository at: > > git@gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel.git tags/intel-gpio-v5.12-2 > > for you to fetch changes up to 437b57d2085950a813c028215513fe941ca2e616: > > gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2 (2021-03-03 09:49:47 +0200) > > ---------------------------------------------------------------- > intel-gpio for v5.12-2 > > * Fix IRQ flags for ACPI event handler > * Redo Intel Galileo Gen 2 quirk due to revealed regression > > The following is an automated git shortlog grouped by driver: > > gpiolib: > - acpi: Allow to find GpioInt() resource by name and index > - acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk > - acpi: Add missing IRQF_ONESHOT > > pca953x: > - Set IRQ type when handle Intel Galileo Gen 2 > > ---------------------------------------------------------------- > Andy Shevchenko (3): > gpiolib: acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk > gpiolib: acpi: Allow to find GpioInt() resource by name and index > gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2 > > Yang Li (1): > gpiolib: acpi: Add missing IRQF_ONESHOT > > drivers/gpio/gpio-pca953x.c | 78 +++++++++++++------------------------------ > drivers/gpio/gpiolib-acpi.c | 21 ++++++++---- > include/linux/acpi.h | 10 ++++-- > include/linux/gpio/consumer.h | 2 ++ > 4 files changed, 48 insertions(+), 63 deletions(-) > > -- > With Best Regards, > Andy Shevchenko > > Pulled, thanks! Bartosz
On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > > Hi Linux GPIO and ACPI maintainers, > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > PR is to both subsystems. > Pulled, thanks! Thanks! Though I don't see it in your repository.
On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > Hi Linux GPIO and ACPI maintainers, > > > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > > PR is to both subsystems. > > > Pulled, thanks! > > Thanks! Though I don't see it in your repository. > > -- > With Best Regards, > Andy Shevchenko > > For some reason the merge commit doesn't show up but I do have the patches. Strange, I remember seeing the merge commit when I pulled it. Bart
On Tue, Mar 9, 2021 at 5:25 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > > > Hi Linux GPIO and ACPI maintainers, > > > > > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > > > PR is to both subsystems. > > > > > Pulled, thanks! > > > > Thanks! Though I don't see it in your repository. > For some reason the merge commit doesn't show up but I do have the > patches. Strange, I remember seeing the merge commit when I pulled it. Hmm... I have rebased recently _after_ I saw these patches in your branch. In any case It seems you need to rebase for-current due to issues Stephen noticed. Note, it's a tag, not a branch. It's still there and available. https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git/tag/?h=intel-gpio-v5.12-2
On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: > > > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > > > Hi Linux GPIO and ACPI maintainers, > > > > > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > > > PR is to both subsystems. > > > > > Pulled, thanks! > > > > Thanks! Though I don't see it in your repository. > > > > -- > > With Best Regards, > > Andy Shevchenko > > > > > > For some reason the merge commit doesn't show up but I do have the > patches. Strange, I remember seeing the merge commit when I pulled it. Did you rebase the branch after pulling? That will drop the merge commit, and will also make linux-next complain that the commiter has not signed off the commits. (I.e. don't rebase a branch where you pulled in something.) Yours, Linus Walleij
On Tue, Mar 9, 2021 at 4:33 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > > > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > > > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > > > > > Hi Linux GPIO and ACPI maintainers, > > > > > > > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > > > > PR is to both subsystems. > > > > > > > Pulled, thanks! > > > > > > Thanks! Though I don't see it in your repository. > > > > > > -- > > > With Best Regards, > > > Andy Shevchenko > > > > > > > > > > For some reason the merge commit doesn't show up but I do have the > > patches. Strange, I remember seeing the merge commit when I pulled it. > > Did you rebase the branch after pulling? > > That will drop the merge commit, and will also make linux-next > complain that the commiter has not signed off the commits. > (I.e. don't rebase a branch where you pulled in something.) > > Yours, > Linus Walleij Ah cr*p I did because of the v5.12-rc1 problem signalled by Linus Torvalds. :( And I already sent a PR to him too... Anything I can do now to fix that? Bartosz
On Tue, Mar 9, 2021 at 5:34 PM Linus Walleij <linus.walleij@linaro.org> wrote: > On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > On Mon, Mar 8, 2021 at 11:26 AM Andy Shevchenko > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > On Sat, Mar 06, 2021 at 12:38:33PM +0100, Bartosz Golaszewski wrote: > > > > On Wed, Mar 3, 2021 at 3:09 PM Andy Shevchenko > > > > <andriy.shevchenko@linux.intel.com> wrote: > > > > > > > > > > Hi Linux GPIO and ACPI maintainers, > > > > > > > > > > This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this > > > > > PR is to both subsystems. > > > > > > > Pulled, thanks! > > > > > > Thanks! Though I don't see it in your repository. > > For some reason the merge commit doesn't show up but I do have the > > patches. Strange, I remember seeing the merge commit when I pulled it. > > Did you rebase the branch after pulling? > > That will drop the merge commit, and will also make linux-next > complain that the commiter has not signed off the commits. > (I.e. don't rebase a branch where you pulled in something.) Actually one may use --rebase-merges (that's my default option after I learn it, okay, I actually learnt its predecessor).
On Tue, Mar 9, 2021 at 4:36 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > Ah cr*p I did because of the v5.12-rc1 problem signalled by Linus Torvalds. :( > > And I already sent a PR to him too... > > Anything I can do now to fix that? Fix up the branch (just add your own Signed-off-by's) then send an updated pull request from the new signed hash. That's what I do :D Yours, Linus Walleij
On Tue, Mar 9, 2021 at 5:38 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > On Tue, Mar 9, 2021 at 4:33 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: ... > > Did you rebase the branch after pulling? > > > > That will drop the merge commit, and will also make linux-next > > complain that the commiter has not signed off the commits. > > (I.e. don't rebase a branch where you pulled in something.) > > > > Yours, > > Linus Walleij > > Ah cr*p I did because of the v5.12-rc1 problem signalled by Linus Torvalds. :( > > And I already sent a PR to him too... > > Anything I can do now to fix that? Yep! Steps are easy: 0) tell Linus T. that you have to redo PR 1) take the base as https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git/commit/?h=gpio/for-current&id=cf25ef6b631c6fc6c0435fc91eba8734cca20511 2) Merge my tag as I explained in the other mail thread 3) (re)apply https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git/commit/?h=gpio/for-current&id=b41ba2ec54a70908067034f139aa23d0dd2985ce 4) create a new tag 5) send PR to Linus T again Yes, it will mess up the history, but it will fix the issue.
On Tue, Mar 9, 2021 at 5:43 PM Linus Walleij <linus.walleij@linaro.org> wrote: > > On Tue, Mar 9, 2021 at 4:36 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > Ah cr*p I did because of the v5.12-rc1 problem signalled by Linus Torvalds. :( > > > > And I already sent a PR to him too... > > > > Anything I can do now to fix that? > > Fix up the branch (just add your own Signed-off-by's) then send an updated > pull request from the new signed hash. That's what I do :D I think it's easier and actually preferable to save my tag. This time it won't matter, but previously (when you, Linus, did that) it broke my fast-forward capabilities. So, it is a way to fix, but I say "not recommended"
Hi Linux GPIO and ACPI maintainers, This is material for v5.12-rcX (presumably -rc2). Since it touches ACPI, this PR is to both subsystems. Thanks, With Best Regards, Andy Shevchenko The following changes since commit fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8: Linux 5.12-rc1 (2021-02-28 16:05:19 -0800) are available in the Git repository at: git@gitolite.kernel.org:pub/scm/linux/kernel/git/andy/linux-gpio-intel.git tags/intel-gpio-v5.12-2 for you to fetch changes up to 437b57d2085950a813c028215513fe941ca2e616: gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2 (2021-03-03 09:49:47 +0200) ---------------------------------------------------------------- intel-gpio for v5.12-2 * Fix IRQ flags for ACPI event handler * Redo Intel Galileo Gen 2 quirk due to revealed regression The following is an automated git shortlog grouped by driver: gpiolib: - acpi: Allow to find GpioInt() resource by name and index - acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk - acpi: Add missing IRQF_ONESHOT pca953x: - Set IRQ type when handle Intel Galileo Gen 2 ---------------------------------------------------------------- Andy Shevchenko (3): gpiolib: acpi: Add ACPI_GPIO_QUIRK_ABSOLUTE_NUMBER quirk gpiolib: acpi: Allow to find GpioInt() resource by name and index gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2 Yang Li (1): gpiolib: acpi: Add missing IRQF_ONESHOT drivers/gpio/gpio-pca953x.c | 78 +++++++++++++------------------------------ drivers/gpio/gpiolib-acpi.c | 21 ++++++++---- include/linux/acpi.h | 10 ++++-- include/linux/gpio/consumer.h | 2 ++ 4 files changed, 48 insertions(+), 63 deletions(-)