Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 29 Mar 2021 16:37:00 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Greg KH <greg@kroah.com>, Sudeep Holla <sudeep.holla@arm.com>
Cc:     Cristian Marussi <cristian.marussi@arm.com>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the staging tree with the scmi tree
Message-ID: <20210329163700.673b51e9@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.biKiUG0_tD30u8yzvX01BR";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

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 int=
erface")

from the scmi tree and commit:

  1b33dfa5d5f1 ("Merge remote-tracking branch 'local/ib-iio-scmi-5.12-rc2-t=
ake3' 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.

--=20
Cheers,
Stephen Rothwell

diff --cc drivers/iio/common/scmi_sensors/scmi_iio.c
index b4bdc3f3a946,63e4cec9de5e..000000000000
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@@ -501,23 -528,9 +501,9 @@@ static int scmi_iio_set_sampling_freq_a
  	return 0;
  }
 =20
- static int scmi_iio_buffers_setup(struct iio_dev *scmi_iiodev)
- {
- 	struct iio_buffer *buffer;
-=20
- 	buffer =3D devm_iio_kfifo_allocate(&scmi_iiodev->dev);
- 	if (!buffer)
- 		return -ENOMEM;
-=20
- 	iio_device_attach_buffer(scmi_iiodev, buffer);
- 	scmi_iiodev->modes |=3D INDIO_BUFFER_SOFTWARE;
- 	scmi_iiodev->setup_ops =3D &scmi_iio_buffer_ops;
- 	return 0;
- }
-=20
 -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, struct scmi_protocol_handle *=
ph,
 +		  const struct scmi_sensor_info *sensor_info)
  {
  	struct iio_chan_spec *iio_channels;
  	struct scmi_iio_priv *sensor;

--Sig_/.biKiUG0_tD30u8yzvX01BR
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmBhZ3wACgkQAVBC80lX
0Gx9Owf8DQqZOiMwR4oxq+2MutYO7PrRcUYhvoZ7CapDE8LksClbIQy8twfMD1Ib
9Hr9LE4xAPIk/LaZEz2j8cFea53eZupvwy7bTIYh816xLppH9ZlQMpAbwHznWhsG
TJ8mbgchMx3/D507hjdDj08fGZfotZsia4g4pLceLxAf0unL43HXHt+S4iEVm7et
XYp6sgNKYItXQMddUUSOhN0xYkh9gD15grtzalAhjtB9xwxXZigS1Taw3dHO5BFJ
Vxvtxk6S4ycp+vJ1huuW517/olaOmj04xW5rLW6iB1Ppk7m+6uR6FYuvZY+AoJtG
JMTBRVMhdUpw5Cge5Jbx+34bCsP9uA==
=5SZd
-----END PGP SIGNATURE-----

--Sig_/.biKiUG0_tD30u8yzvX01BR--