From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8EE1CDB465 for ; Mon, 16 Oct 2023 07:17:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231861AbjJPHRO (ORCPT ); Mon, 16 Oct 2023 03:17:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232095AbjJPHRN (ORCPT ); Mon, 16 Oct 2023 03:17:13 -0400 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 714B7F0 for ; Mon, 16 Oct 2023 00:17:10 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qsHqa-0001mi-Uk; Mon, 16 Oct 2023 09:17:04 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qsHqZ-0021sI-QO; Mon, 16 Oct 2023 09:17:03 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1qsHqZ-00GxzK-H4; Mon, 16 Oct 2023 09:17:03 +0200 Date: Mon, 16 Oct 2023 09:16:59 +0200 From: Uwe =?utf-8?Q?Kleine-K=C3=B6nig?= To: Stephen Rothwell Cc: Bartosz Golaszewski , Greg KH , Bartosz Golaszewski , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Wentong Wu Subject: Re: linux-next: manual merge of the gpio-brgl tree with the usb tree Message-ID: <20231016071659.qbc4s7syiv3zgqsk@pengutronix.de> References: <20231016134159.11d8f849@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ry7z4n62q7an2p3j" Content-Disposition: inline In-Reply-To: <20231016134159.11d8f849@canb.auug.org.au> X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-next@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --ry7z4n62q7an2p3j Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hello, On Mon, Oct 16, 2023 at 01:41:59PM +1100, Stephen Rothwell wrote: > 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. >=20 > 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. Looks right. As this isn't a platform_driver any more, dropping the conversion to .remove_new is the right thing. Thanks Uwe --=20 Pengutronix e.K. | Uwe Kleine-K=F6nig | Industrial Linux Solutions | https://www.pengutronix.de/ | --ry7z4n62q7an2p3j Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEP4GsaTp6HlmJrf7Tj4D7WH0S/k4FAmUs42oACgkQj4D7WH0S /k4kggf+LjzZK6fUvEOgjgm0dlQMjXhBBbPdn1ELYpf+PrBVDoWJP0Q8KHiA+ct/ YAfeSK4a8qrisKUHafb1Ne4x8TfCTv76Pa1VDjCEM+BLCbaT0FOoE3bVpxru32gp Ac2GsPNOW7CI4QGyTWpCbLBlW2jb3NAXuXvL6d3RPhM2jcHwAZU+vleT+nxkasD9 LHISSTzq4gZsq+9ZX0e0m9R/4qKaDhoBrr6oq5ZviAuXBnqOLC2KUgySZpE9Izvo ygDcAuye9jXYl+URwEBjIEveTd5+WYYI6fZJUaX65erv0Ah2icuOTNqxm3wdf7m9 ZiQonmJUUSaVmCvHdgTAe+Bd0zkp/A== =68Ft -----END PGP SIGNATURE----- --ry7z4n62q7an2p3j--