Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Mon, 16 Oct 2023 13:41:59 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bartosz Golaszewski <brgl@bgdev.pl>, Greg KH <greg@kroah.com>
Cc:     Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>, Wentong Wu <wentong.wu@intel.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the usb tree
Message-ID: <20231016134159.11d8f849@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/29hwr.bLS4F.SScvmFOrI4.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/29hwr.bLS4F.SScvmFOrI4.
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-ljca.c

between commit:

  1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")

from the usb tree and commit:

  da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returning =
void")

from the gpio-brgl tree.

I fixed it up (I just used the former version) 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

--Sig_/29hwr.bLS4F.SScvmFOrI4.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUsovcACgkQAVBC80lX
0Gxrrwf+ONTK4m5eTlr5sxpiSwCMAN1+Q5x/jwgNG071VDejv+Y7yyOn49Q3eK/u
wBwimZBQFn6M8fg3j2S+vDWuQjCrlHvb1ewwuX9RuknGUKlMQYqtR5bWJtP7tl1R
Htr5jB8HDGsY9sZXQ10QAD+mpWOmhTbd4uynrAsLDBSA0I1dknogWAKeTPhwz276
hvstMAUg2B/ZeHWbe2fl4BQtp7oDz1cqYlP1N4mWzJsAfg8Z4riTAmJRk/k6awOi
8hagOzjgeSqRtxH0/PNazpXJ8W+m8gqFM2JQiEJrNH+npYUqF0cYJqapDFXRd1iV
7cxgDkRsMI1vkYgu7fNXPOlG0MTWoQ==
=/gHM
-----END PGP SIGNATURE-----

--Sig_/29hwr.bLS4F.SScvmFOrI4.--