Subject: linux-next: manual merge of the staging tree with the scmi tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 31 Mar 2021 17:51:51 +1100

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:

  25cbdd4609c0 ("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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/iio/common/scmi_sensors/scmi_iio.c
index 8f4154d92c68,63e4cec9de5e..000000000000
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@@ -505,25 -528,9 +505,11 @@@ static int scmi_iio_set_sampling_freq_a
  	return 0;
  }
  
- static int scmi_iio_buffers_setup(struct iio_dev *scmi_iiodev)
- {
- 	struct iio_buffer *buffer;
- 
- 	buffer = devm_iio_kfifo_allocate(&scmi_iiodev->dev);
- 	if (!buffer)
- 		return -ENOMEM;
- 
- 	iio_device_attach_buffer(scmi_iiodev, buffer);
- 	scmi_iiodev->modes |= INDIO_BUFFER_SOFTWARE;
- 	scmi_iiodev->setup_ops = &scmi_iio_buffer_ops;
- 	return 0;
- }
- 
 -static struct iio_dev *scmi_alloc_iiodev(struct device *dev,
 -					 struct scmi_handle *handle,
 -					 const struct scmi_sensor_info *sensor_info)
 +static struct iio_dev *
 +scmi_alloc_iiodev(struct scmi_device *sdev,
 +		  const struct scmi_sensor_proto_ops *ops,
 +		  struct scmi_protocol_handle *ph,
 +		  const struct scmi_sensor_info *sensor_info)
  {
  	struct iio_chan_spec *iio_channels;
  	struct scmi_iio_priv *sensor;