| Message ID | 20231021183925.22831-1-brgl@bgdev.pl |
|---|---|
| State | New |
| Headers | show |
| Series | [GIT,PULL] gpio: fixes for v6.6-rc7 | expand |
On Sat, 21 Oct 2023 at 11:39, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > drivers/gpio/gpio-vf610.c | 15 ++++++++------- > drivers/gpio/gpiolib-acpi.c | 1 + > 2 files changed, 9 insertions(+), 7 deletions(-) I have no idea how you get that diffstat. Linus
The pull request you sent on Sat, 21 Oct 2023 20:39:25 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-fixes-for-v6.6-rc7
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d537ae43f8a107761fb5a85c3f0cfce5ca79bcb1
Thank you!
On Sat, Oct 21, 2023 at 10:02 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Sat, 21 Oct 2023 at 11:39, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > drivers/gpio/gpio-vf610.c | 15 ++++++++------- > > drivers/gpio/gpiolib-acpi.c | 1 + > > 2 files changed, 9 insertions(+), 7 deletions(-) > > I have no idea how you get that diffstat. > I have diff.algorithm = patience in my gitconfig. Typically this results in better diffs but not this time for some reason. Bart
On Sun, 22 Oct 2023 at 06:12, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > I have diff.algorithm = patience in my gitconfig. Typically this > results in better diffs but not this time for some reason. Yeah, that picks a really odd diff in this case. May I actually suggest the 'histogram' diff algorithm to you? It's kind of a "smarter patience" version, and at least for me it's been the best of the choices. Of course, there's always going to be some odd case where for one reason or another one of the diff algorithms does better than the others, but histogram does seem to result in good diffs most of the time. Linus
On Sun, Oct 22, 2023 at 4:32 PM Linus Torvalds <torvalds@linux-foundation.org> wrote: > > On Sun, 22 Oct 2023 at 06:12, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > > > I have diff.algorithm = patience in my gitconfig. Typically this > > results in better diffs but not this time for some reason. > > Yeah, that picks a really odd diff in this case. > > May I actually suggest the 'histogram' diff algorithm to you? It's > kind of a "smarter patience" version, and at least for me it's been > the best of the choices. > > Of course, there's always going to be some odd case where for one > reason or another one of the diff algorithms does better than the > others, but histogram does seem to result in good diffs most of the > time. > Sure, I'll use it from now on. Thanks, Bartosz
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Linus, Please pull another round of fixes from the GPIO subsystem for the next RC. There are two fixes for one of the drivers and a one-liner for ACPI handling. Details are in the signed tag. Bartosz The following changes since commit 58720809f52779dc0f08e53e54b014209d13eebb: Linux 6.6-rc6 (2023-10-15 13:34:39 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git tags/gpio-fixes-for-v6.6-rc7 for you to fetch changes up to 479ac419206b5fe4ce4e40de61ac3210a36711aa: gpiolib: acpi: Add missing memset(0) to acpi_get_gpiod_from_data() (2023-10-20 11:24:16 +0200) ---------------------------------------------------------------- gpio fixes for v6.6-rc7 - fix interrupt handling in suspend and wakeup in gpio-vf610 - fix a bug on setting direction to output in gpio-vf610 - add a missing memset() in gpio ACPI code ---------------------------------------------------------------- Andy Shevchenko (1): gpiolib: acpi: Add missing memset(0) to acpi_get_gpiod_from_data() Haibo Chen (2): gpio: vf610: mask the gpio irq in system suspend and support wakeup gpio: vf610: set value before the direction to avoid a glitch drivers/gpio/gpio-vf610.c | 15 ++++++++------- drivers/gpio/gpiolib-acpi.c | 1 + 2 files changed, 9 insertions(+), 7 deletions(-)