On Fri, 1 Oct 2021 13:38:41 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the iio tree got a conflict in:
>
> drivers/iio/adc/aspeed_adc.c
>
> between commit:
>
> eb795cd97365 ("iio: adc: aspeed: set driver data when adc probe.")
>
> from the iio-fixes tree and commit:
>
> e96b152c6cc2 ("iio: adc: aspeed: Keep model data to driver data.")
>
> from the iio 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.
>
Thanks.
Looks good to me.
Jonathan
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/iio/adc/aspeed_adc.c
> index 34ec0c28b2df,9e2c85c3cbe9..000000000000
> --- a/drivers/iio/adc/aspeed_adc.c
> +++ b/drivers/iio/adc/aspeed_adc.c
> @@@ -183,7 -492,7 +492,8 @@@ static int aspeed_adc_probe(struct plat
>
> data = iio_priv(indio_dev);
> data->dev = &pdev->dev;
> + platform_set_drvdata(pdev, indio_dev);
> + data->model_data = of_device_get_match_data(&pdev->dev);
>
> data->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(data->base))
