From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Jul 2026 15:38:12 +0000 (-1000)
Subject: Merge tag 'gpio-fixes-for-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=2916bfc6baf7e1215b00169d285b88321299b629;p=linux-2.6-microblaze.git

Merge tag 'gpio-fixes-for-v7.2-rc2' of git://git./linux/kernel/git/brgl/linux

Pull gpio fixes from Bartosz Golaszewski:

 - check the return value of gpiochip_add_data() in gpio-mvebu and
   gpio-htc-egpio

 - avoid locking context issues with GPIO drivers using the shared GPIO
   proxy by only allowing sleeping operations (atomic GPIO ops don't
   really make sense in shared context anyway)

 - with the above: restore non-sleeping GPIO access in pinctrl-meson

 - fix return value on OOM in gpio-timberdale

 - fix interrupt handling in gpio-mt7621

 - support both A and B variants of NCT6126D in gpio-f7188x

* tag 'gpio-fixes-for-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  pinctrl: meson: restore non-sleeping GPIO access
  gpio: timberdale: Return -ENOMEM on dynamic memory allocation in probe
  gpio: mt7621: be sure IRQ domain is created before exposing GPIO chips
  gpio: mt7621: more robust management of IRQ domain teardown
  gpio: mt7621: avoid corruption of shared interrupt trigger state
  gpio: shared-proxy: always serialize with a sleeping mutex
  gpio-f7188x: Add support for NCT6126D version B
  gpio: htc-egpio: use managed gpiochip registration
  gpio: mvebu: fail probe if gpiochip registration fails
---

2916bfc6baf7e1215b00169d285b88321299b629
diff --cc drivers/gpio/gpio-shared-proxy.c
index d3625b8d0ced,10ca2ef77ef3..0f39d23ea9cb
--- a/drivers/gpio/gpio-shared-proxy.c
+++ b/drivers/gpio/gpio-shared-proxy.c
@@@ -9,7 -9,10 +9,9 @@@
  #include <linux/err.h>
  #include <linux/gpio/consumer.h>
  #include <linux/gpio/driver.h>
+ #include <linux/lockdep.h>
 -#include <linux/mod_devicetable.h>
  #include <linux/module.h>
+ #include <linux/mutex.h>
  #include <linux/string_choices.h>
  #include <linux/types.h>