Re: linux-next: manual merge of the pm tree with the i2c tree

[Uwe Kleine-König]

On Wed, Oct 05, 2022 at 11:18:36AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Thu, 29 Sep 2022 13:18:53 +0100 broonie@xxxxxxxxxx wrote:
> >
> > Today's linux-next merge of the pm tree got a conflict in:
> > 
> >   drivers/platform/x86/intel/int3472/tps68470.c
> > 
> > between commit:
> > 
> >   ed5c2f5fd10dd ("i2c: Make remove callback return void")
> > 
> > from the i2c tree and commit:
> > 
> >   06a659d1f0a0a ("platform/x86: int3472: Support multiple gpio lookups in board data")
> > 
> > from the pm 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.
> > 
> > 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;
> >   }
> >   
> >  -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;
> >   
> >   	board_data = 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 = 0; i < board_data->n_gpiod_lookups; i++)
> > + 			gpiod_remove_lookup_table(board_data->tps68470_gpio_lookup_tables[i]);
> > + 	}
> >  -
> >  -	return 0;
> >   }
> >   
> >   static const struct acpi_device_id int3472_device_id[] = {
> 
> This is now a conflict between the i2c tree and Linus' tree.

In the meantime the i2c tree is pulled, too and Linus solved the
conflict in the same way in b86406d42ae3c41ae0ce332ea24350829b88af51.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

Attachment: signature.asc
Description: PGP signature