Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4;
Date:   Thu, 19 Oct 2023 16:06:16 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bartosz Golaszewski <brgl@bgdev.pl>
Cc:     Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
        Haibo Chen <haibo.chen@nxp.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Peng Fan <peng.fan@nxp.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the
 gpio-brgl-fixes tree
Message-ID: <20231019160616.55eac2b8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/gKMLqWJsE9g7n6NH+h6h7wc";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/gKMLqWJsE9g7n6NH+h6h7wc
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/gpio-vf610.c

between commit:

  fc363413ef8e ("gpio: vf610: set value before the direction to avoid a gli=
tch")

from the gpio-brgl-fixes tree and commit:

  b57587f11f81 ("gpio: vf610: simplify code by dropping data check")

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/gpio-vf610.c
index 656d6b1dddb5,a89ae84a1fa0..000000000000
--- a/drivers/gpio/gpio-vf610.c
+++ b/drivers/gpio/gpio-vf610.c
@@@ -126,9 -140,7 +140,9 @@@ static int vf610_gpio_direction_output(
  	unsigned long mask =3D BIT(gpio);
  	u32 val;
 =20
 +	vf610_gpio_set(chip, gpio, value);
 +
- 	if (port->sdata && port->sdata->have_paddr) {
+ 	if (port->sdata->have_paddr) {
  		val =3D vf610_gpio_readl(port->gpio_base + GPIO_PDDR);
  		val |=3D mask;
  		vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR);

--Sig_/gKMLqWJsE9g7n6NH+h6h7wc
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUwuUgACgkQAVBC80lX
0Gyd2gf/dQ6zSSR8z670iJGYg4EzgEZingaVqUsYF2m2hKyCUw2N2KC6sq4mZz9C
/GAOtcpgBQ6jcImdeJBzvz1AQnSq9ciXJBNTnZEvKXNLIgJX0V+2cE/i5J4ByaJw
pORWOAUfkZdFYll3wMo//wgo7MRbFjyGF/r3oTEzvG8sjwrKLhhANUiFuGPpetdo
WxJR6mVXACFSDqRJAI9YYb1RQ92HRXSdd3Ah/IrnL9Lg//8gHDdsOtkuxEzRm8pL
4ofuI42wicK27IR7w+Bm6abWBuzWrJnWUk8LmZ9kf9QX5PGmTgV9hZqsgdcSXMdx
NtuDpqqMzcBhlt9tJJxA3bhnlq1mQw==
=Z+a7
-----END PGP SIGNATURE-----

--Sig_/gKMLqWJsE9g7n6NH+h6h7wc--