On Mon, 29 Mar 2021 16:37:00 +1100
Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/iio/common/scmi_sensors/scmi_iio.c
>
> between commit:
>
> fc91d6b6f0ba ("iio/scmi: port driver to the new scmi_sensor_proto_ops
> interface")
>
> from the scmi tree and commit:
>
> 1b33dfa5d5f1 ("Merge remote-tracking branch
> 'local/ib-iio-scmi-5.12-rc2-take3' into togreg")
>
> from the staging 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 Stephen,
Looks right. I'll check the overall result once your tree is public.
Jonathan
