Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 5 Oct 2022 11:18:36 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Wolfram Sang <wsa@kernel.org>
Cc:     broonie@kernel.org, "Rafael J . Wysocki" <rjw@rjwysocki.net>,
        Daniel Scally <djrscally@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
        Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>
Subject: Re: linux-next: manual merge of the pm tree with the i2c tree
Message-ID: <20221005111836.1d43b228@canb.auug.org.au>
In-Reply-To: <20220929121853.100271-1-broonie@kernel.org>
References: <20220929121853.100271-1-broonie@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/CLTNpKS0jBQ_rQVV2IB/Hax";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/CLTNpKS0jBQ_rQVV2IB/Hax
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 29 Sep 2022 13:18:53 +0100 broonie@kernel.org wrote:
>
> Today's linux-next merge of the pm tree got a conflict in:
>=20
>   drivers/platform/x86/intel/int3472/tps68470.c
>=20
> between commit:
>=20
>   ed5c2f5fd10dd ("i2c: Make remove callback return void")
>=20
> from the i2c tree and commit:
>=20
>   06a659d1f0a0a ("platform/x86: int3472: Support multiple gpio lookups in=
 board data")
>=20
> from the pm tree.
>=20
> 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
> diff --cc drivers/platform/x86/intel/int3472/tps68470.c
> index 5dd81bb05255b,49fc379fe680a..0000000000000
> --- a/drivers/platform/x86/intel/int3472/tps68470.c
> +++ b/drivers/platform/x86/intel/int3472/tps68470.c
> @@@ -178,13 -227,18 +227,16 @@@ static int skl_int3472_tps68470_probe(s
>   	return ret;
>   }
>  =20
>  -static int skl_int3472_tps68470_remove(struct i2c_client *client)
>  +static void skl_int3472_tps68470_remove(struct i2c_client *client)
>   {
>   	const struct int3472_tps68470_board_data *board_data;
> + 	int i;
>  =20
>   	board_data =3D int3472_tps68470_get_board_data(dev_name(&client->dev));
> - 	if (board_data)
> - 		gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_table);
> + 	if (board_data) {
> + 		for (i =3D 0; i < board_data->n_gpiod_lookups; i++)
> + 			gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_tables[i]=
);
> + 	}
>  -
>  -	return 0;
>   }
>  =20
>   static const struct acpi_device_id int3472_device_id[] =3D {

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

--=20
Cheers,
Stephen Rothwell

--Sig_/CLTNpKS0jBQ_rQVV2IB/Hax
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmM8zVwACgkQAVBC80lX
0GwQngf/WF8wXmsfi5kUfnXMK94ra2tDNX5ggeeBNpWXltiuOa9/lWZ6SFdHSYI9
oCQHBgUWd/is0mxr4l0+lHFyu0RDUFOeYXWyXKb3RW+fbHiHiAtfG3PZMV2fDLaK
RDXY0f5GfgwHYKeWOlRs/qwOpfwEBOswE2RG+dWQi5Sq7Rk1SRnWTtBq2OXXLHj9
pBWaDyqyUjSRdoPPo+Vk+MBfvefXgYWCDGKH3vYN1lrWTkyILOdJprEiI57Wtixj
aUaBkuGeygKvSkTw0W/8yYLIF2uE4h27Ln58CVhcy6gMdXbfz6iKfX9U87U4tboT
/oY1jKfnn6QoHEUfVe2B4HkQp4QeoA==
=WEGa
-----END PGP SIGNATURE-----

--Sig_/CLTNpKS0jBQ_rQVV2IB/Hax--