intel-gpio for 5.12-2
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:
[email protected]: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(-)
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 54 lines · Andy Shevchenko
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 ShevchenkoThe following changes since commit
fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8:Linux 5.12-rc1 (2021-02-28 16:05:19 -0800)
are available in the Git repository at:
[email protected]: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 regressionThe 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_ONESHOTpca953x:
- Set IRQ type when handle Intel Galileo Gen 2----------------------------------------------------------------
Andy Shevchenko (3):
gpiolib: acpi: AddACPI_GPIO_QUIRK_ABSOLUTE_NUMBERquirk
gpiolib: acpi: Allow to findGpioInt()resource by name and index
gpio: pca953x: Set IRQ type when handle Intel Galileo Gen 2Yang Li (1):
gpiolib: acpi: Add missingIRQF_ONESHOTdrivers/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(-)
Quoted 5 lines
--
With Best Regards,
Andy Shevchenko
Pulled, thanks!
Bartosz
Quoted 9 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Quoted 9 lines
Quoted 1 line
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
Quoted 13 lines · Bartosz Golaszewski
Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
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
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 16 lines · Bartosz Golaszewski
Quoted 14 lines · Andy Shevchenko
Quoted 9 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Quoted 8 lines
Quoted 5 lines
--
With Best Regards,
Andy ShevchenkoFor 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
Quoted 27 lines · Linus Walleij
Quoted 16 lines · Bartosz Golaszewski
Quoted 14 lines · Andy Shevchenko
Quoted 9 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Quoted 8 lines
Quoted 5 lines
--
With Best Regards,
Andy ShevchenkoFor 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.
Quoted 8 lines
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
Quoted 17 lines · Linus Walleij
Quoted 15 lines · Bartosz Golaszewski
Quoted 13 lines · Andy Shevchenko
Quoted 9 lines · Bartosz Golaszewski
Quoted 5 lines · Andy Shevchenko
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.
Quoted 8 lines
Quoted 2 lines
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).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 5 lines · Bartosz Golaszewski
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
Quoted 2 lines · Bartosz Golaszewski
Quoted 1 line · Linus Walleij
On Tue, Mar 9, 2021 at 4:24 PM Bartosz Golaszewski <[email protected]> wrote:
...
Quoted 6 lines
Quoted 6 lines
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.)
Quoted 8 lines
Quoted 2 lines
Yours,
Linus WalleijAh 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.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 11 lines · Linus Walleij
Quoted 5 lines · Bartosz Golaszewski
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"
Signature · 2 lines
With Best Regards, Andy Shevchenko