Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Date:   Thu, 2 Nov 2023 11:29:50 +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: Re: linux-next: manual merge of the gpio-brgl tree with the usb
 tree
Message-ID: <20231102112950.4706f887@canb.auug.org.au>
In-Reply-To: <20231016134159.11d8f849@canb.auug.org.au>
References: <20231016134159.11d8f849@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/JIf8eFlvsk4.2uZ7M9Njdu9";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/JIf8eFlvsk4.2uZ7M9Njdu9
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Mon, 16 Oct 2023 13:41:59 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>=20
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>=20
>   drivers/gpio/gpio-ljca.c
>=20
> between commit:
>=20
>   1034cc423f1b ("gpio: update Intel LJCA USB GPIO driver")
>=20
> from the usb tree and commit:
>=20
>   da2ad5fe2292 ("gpio: ljca: Convert to platform remove callback returnin=
g void")
>=20
> from the gpio-brgl tree.

This is now a conflict between the usb tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/JIf8eFlvsk4.2uZ7M9Njdu9
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVC7X4ACgkQAVBC80lX
0GwICgf/STdIjNFb9Z8WrRKSviBY3j3skfpl4swVJ1p8UY8g5QY2UHiyy+wPRl6Z
rFhjMTjPXvJg73Tgbz23OfUXk2sfeAgSv8fMGXP0gyoO+BlKYSyT/DILDfpcdc6C
2VX5DSxh2u6NXHtWPLhFHjPHqKEswM8CRId64CP/sX6bK/RRYP/6LoP3s5ZfHXCz
LuMpn/1iIakS+LSubjrraM42ClOiWDqMru5gp5s4TfDpJdXu6yYvqDKH6wTXcP72
LicrGLOBLdBwHWWJ9aot0xf23dKJiPyBgRMfdLnA0OIBJrJqhhW2TDT1hdxHXfd6
Mp3DKX11TJsRznZ1UJ3rhz3FS8pXJQ==
=he8V
-----END PGP SIGNATURE-----

--Sig_/JIf8eFlvsk4.2uZ7M9Njdu9--