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
Date: Mon, 29 Mar 2021 16:37:00 +1100 [thread overview]
Message-ID: <20210329163700.673b51e9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1866 bytes --]
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.
--
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;
}
- 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, struct scmi_protocol_handle *ph,
+ const struct scmi_sensor_info *sensor_info)
{
struct iio_chan_spec *iio_channels;
struct scmi_iio_priv *sensor;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-03-29 5:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 5:37 Stephen Rothwell [this message]
2021-03-29 9:25 ` linux-next: manual merge of the staging tree with the scmi tree Jonathan Cameron
2021-03-31 6:51 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329163700.673b51e9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Jonathan.Cameron@huawei.com \
--cc=cristian.marussi@arm.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).