Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the staging tree with the scmi tree
@ 2021-03-29  5:37 Stephen Rothwell
  2021-03-29  9:25 ` Jonathan Cameron
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2021-03-29  5:37 UTC (permalink / raw)
  To: Greg KH, Sudeep Holla
  Cc: Cristian Marussi, Jonathan Cameron, Linux Kernel Mailing List,
	Linux Next Mailing List


[-- 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 --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: linux-next: manual merge of the staging tree with the scmi tree
  2021-03-29  5:37 linux-next: manual merge of the staging tree with the scmi tree Stephen Rothwell
@ 2021-03-29  9:25 ` Jonathan Cameron
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Cameron @ 2021-03-29  9:25 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Greg KH, Sudeep Holla, Cristian Marussi,
	Linux Kernel Mailing List, Linux Next Mailing List

On Mon, 29 Mar 2021 16:37:00 +1100
Stephen Rothwell <sfr@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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* linux-next: manual merge of the staging tree with the scmi tree
@ 2021-03-31  6:51 Stephen Rothwell
  0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2021-03-31  6:51 UTC (permalink / raw)
  To: Greg KH, Sudeep Holla
  Cc: Cristian Marussi, Jonathan Cameron, Linux Kernel Mailing List,
	Linux Next Mailing List


[-- Attachment #1: Type: text/plain, Size: 1922 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:

  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;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29  5:37 linux-next: manual merge of the staging tree with the scmi tree Stephen Rothwell
2021-03-29  9:25 ` Jonathan Cameron
2021-03-31  6:51 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git