Received-SPF: pass (google.com: domain of linux-kernel+bounces-175291-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 10 May 2024 15:32:12 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Bartosz Golaszewski
 <bartosz.golaszewski@linaro.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the gpio-brgl tree with the
 gpio-brgl-fixes tree
Message-ID: <20240510153212.246fbf31@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/qDmjeN_OLM+6fY5xnP1mEb7";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/qDmjeN_OLM+6fY5xnP1mEb7
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  drivers/gpio/gpiolib.h

between commit:

  7765ffed533d ("gpiolib: use a single SRCU struct for all GPIO descriptors=
")

from the gpio-brgl-fixes tree and commit:

  8a7a61032587 ("gpiolib: Get rid of never false gpio_is_valid() calls")

from the gpio-brgl tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/gpio/gpiolib.h
index 8e0e211ebf08,7f94580efdbc..000000000000
--- a/drivers/gpio/gpiolib.h
+++ b/drivers/gpio/gpiolib.h
@@@ -62,8 -61,7 +62,8 @@@ struct gpio_device=20
  	struct module		*owner;
  	struct gpio_chip __rcu	*chip;
  	struct gpio_desc	*descs;
 +	struct srcu_struct	desc_srcu;
- 	int			base;
+ 	unsigned int		base;
  	u16			ngpio;
  	bool			can_sleep;
  	const char		*label;

--Sig_/qDmjeN_OLM+6fY5xnP1mEb7
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9sVwACgkQAVBC80lX
0GzFNAf+MmtJTSA3Za1cWQQhnKBBjAH3PvfH0ZJdJoD5w370zKPTEgTHudbbf3p3
V27fpplfKFyKp+nFtZCHpyOTnuXkI+GskHCwTsdx1vcnLn4E64xyAooNakISPpzY
3QgJ+3+M62MmeJdm21wpQ3NlV9NXRya3zR6/9/W4GDXgXq/ozFFTK7pYXHkKVL5A
jbF9THeEhifpO7Q8OgX1pJ/oEqyerQRGXT0tvNxagtwV8eYeocP9PEFv+hYyojDB
n2pQmgBCvQP1RNwKibQhAgvbIwsVTVp4S/F0L3ROI2lR111V0Q33ON9+Sssu3pVn
hPNUjgfPT27D+fzgJOWTuaN9im5MZA==
=JeJb
-----END PGP SIGNATURE-----

--Sig_/qDmjeN_OLM+6fY5xnP1mEb7--