linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the iio tree with the iio-fixes tree
@ 2024-05-31  4:06 Stephen Rothwell
  0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2024-05-31  4:06 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Adam Rizkalla, Linux Kernel Mailing List,
	Linux Next Mailing List, Vasileios Amoiridis

[-- Attachment #1: Type: text/plain, Size: 784 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/pressure/bmp280-core.c

between commit:

  0f0f6306617c ("iio: pressure: bmp280: Fix BMP580 temperature reading")

from the iio-fixes tree and commit:

  d58479ff81c0 ("iio: pressure: bmp280: Generalize read_{temp,press,humid}() functions")

from the iio tree.

I fixed it up (I just used the latter) 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

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

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

* Re: linux-next: manual merge of the iio tree with the iio-fixes tree
  2024-05-02  8:36 ` Jean-Baptiste Maneyrol
@ 2024-05-02  8:58   ` Jonathan Cameron
  0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2024-05-02  8:58 UTC (permalink / raw)
  To: Jean-Baptiste Maneyrol
  Cc: Stephen Rothwell, Linux Kernel Mailing List, Linux Next Mailing List

 

On Thu, 2 May 2024 08:36:21 +0000
Jean-Baptiste Maneyrol <Jean-Baptiste.Maneyrol@tdk.com> wrote:

> Hello Stephen and Jonathan,
> 
> sorry for the mess, I should have warned Jonathan about it.
> 
> The manual fix is obviously correct, no problem.
> 
> Thanks and sorry for the inconvenience,
> JB

This should be sorted today.
Given timing (and busy week as ever!) I decided I didn't have enough fixes
to do a separate pull and the merge window is close.  So I dragged
the fixes across to the branch targeting the merge window and dealt with
the merge there.  The togreg-fixes branch should no longer have
thse fixes on it.

Jonathan


> 
> 
> ________________________________________
> From: Stephen Rothwell
> Sent: Tuesday, April 30, 2024 07:15
> To: Jonathan Cameron
> Cc: Jean-Baptiste Maneyrol; Linux Kernel Mailing List; Linux Next Mailing List
> Subject: linux-next: manual merge of the iio tree with the iio-fixes tree
> 
> 
> Hi all,
> 
> 
> 
> Today's linux-next merge of the iio tree got a conflict in:
> 
> 
> 
>   drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> 
> 
> 
> between commit:
> 
> 
> 
>   d7230b995246 ("iio: invensense: fix timestamp glitches when switching frequency")
> 
> 
> 
> from the iio-fixes tree and commit:
> 
> 
> 
>   a1432b5b4f4c ("iio: imu: inv_icm42600: add support of ICM-42686-P")
> 
> 
> 
> from the iio 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/imu/inv_icm42600/inv_icm42600_buffer.c
> 
> index 9cde9a9337ad,cfb4a41ab7c1..000000000000
> 
> --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> 
> +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
> 
> @@@ -509,20 -512,20 +512,20 @@@ int inv_icm42600_buffer_fifo_parse(stru
> 
>                  return 0;
> 
>  
> 
>          /* handle gyroscope timestamp and FIFO data parsing */
> 
>  -       ts = &gyro_st->ts;
> 
>  -       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
> 
>  -                                       st->fifo.nb.gyro, st->timestamp.gyro);
> 
>          if (st->fifo.nb.gyro > 0) {
> 
> -                ts = iio_priv(st->indio_gyro);
> 
> ++              ts = &gyro_st->ts;
> 
>  +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro,
> 
>  +                                               st->timestamp.gyro);
> 
>                  ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
> 
>                  if (ret)
> 
>                          return ret;
> 
>          }
> 
>  
> 
>          /* handle accelerometer timestamp and FIFO data parsing */
> 
>  -       ts = &accel_st->ts;
> 
>  -       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
> 
>  -                                       st->fifo.nb.accel, st->timestamp.accel);
> 
>          if (st->fifo.nb.accel > 0) {
> 
> -                ts = iio_priv(st->indio_accel);
> 
> ++              ts = &accel_st->ts;
> 
>  +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel,
> 
>  +                                               st->timestamp.accel);
> 
>                  ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
> 
>                  if (ret)
> 
>                          return ret;
> 
> @@@ -549,16 -554,20 +554,16 @@@ int inv_icm42600_buffer_hwfifo_flush(st
> 
>                  return 0;
> 
>  
> 
>          if (st->fifo.nb.gyro > 0) {
> 
> -                ts = iio_priv(st->indio_gyro);
> 
> +                ts = &gyro_st->ts;
> 
>  -               inv_sensors_timestamp_interrupt(ts, st->fifo.period,
> 
>  -                                               st->fifo.nb.total, st->fifo.nb.gyro,
> 
>  -                                               gyro_ts);
> 
>  +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro, gyro_ts);
> 
>                  ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
> 
>                  if (ret)
> 
>                          return ret;
> 
>          }
> 
>  
> 
>          if (st->fifo.nb.accel > 0) {
> 
> -                ts = iio_priv(st->indio_accel);
> 
> +                ts = &accel_st->ts;
> 
>  -               inv_sensors_timestamp_interrupt(ts, st->fifo.period,
> 
>  -                                               st->fifo.nb.total, st->fifo.nb.accel,
> 
>  -                                               accel_ts);
> 
>  +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel, accel_ts);
> 
>                  ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
> 
>                  if (ret)
> 
>                          return ret;
> 


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

* Re: linux-next: manual merge of the iio tree with the iio-fixes tree
  2024-04-30  5:15 Stephen Rothwell
@ 2024-05-02  8:36 ` Jean-Baptiste Maneyrol
  2024-05-02  8:58   ` Jonathan Cameron
  0 siblings, 1 reply; 6+ messages in thread
From: Jean-Baptiste Maneyrol @ 2024-05-02  8:36 UTC (permalink / raw)
  To: Stephen Rothwell, Jonathan Cameron
  Cc: Linux Kernel Mailing List, Linux Next Mailing List

Hello Stephen and Jonathan,

sorry for the mess, I should have warned Jonathan about it.

The manual fix is obviously correct, no problem.

Thanks and sorry for the inconvenience,
JB


________________________________________
From: Stephen Rothwell
Sent: Tuesday, April 30, 2024 07:15
To: Jonathan Cameron
Cc: Jean-Baptiste Maneyrol; Linux Kernel Mailing List; Linux Next Mailing List
Subject: linux-next: manual merge of the iio tree with the iio-fixes tree


Hi all,



Today's linux-next merge of the iio tree got a conflict in:



  drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c



between commit:



  d7230b995246 ("iio: invensense: fix timestamp glitches when switching frequency")



from the iio-fixes tree and commit:



  a1432b5b4f4c ("iio: imu: inv_icm42600: add support of ICM-42686-P")



from the iio 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/imu/inv_icm42600/inv_icm42600_buffer.c

index 9cde9a9337ad,cfb4a41ab7c1..000000000000

--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c

+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c

@@@ -509,20 -512,20 +512,20 @@@ int inv_icm42600_buffer_fifo_parse(stru

                 return 0;

 

         /* handle gyroscope timestamp and FIFO data parsing */

 -       ts = &gyro_st->ts;

 -       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,

 -                                       st->fifo.nb.gyro, st->timestamp.gyro);

         if (st->fifo.nb.gyro > 0) {

-                ts = iio_priv(st->indio_gyro);

++              ts = &gyro_st->ts;

 +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro,

 +                                               st->timestamp.gyro);

                 ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);

                 if (ret)

                         return ret;

         }

 

         /* handle accelerometer timestamp and FIFO data parsing */

 -       ts = &accel_st->ts;

 -       inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,

 -                                       st->fifo.nb.accel, st->timestamp.accel);

         if (st->fifo.nb.accel > 0) {

-                ts = iio_priv(st->indio_accel);

++              ts = &accel_st->ts;

 +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel,

 +                                               st->timestamp.accel);

                 ret = inv_icm42600_accel_parse_fifo(st->indio_accel);

                 if (ret)

                         return ret;

@@@ -549,16 -554,20 +554,16 @@@ int inv_icm42600_buffer_hwfifo_flush(st

                 return 0;

 

         if (st->fifo.nb.gyro > 0) {

-                ts = iio_priv(st->indio_gyro);

+                ts = &gyro_st->ts;

 -               inv_sensors_timestamp_interrupt(ts, st->fifo.period,

 -                                               st->fifo.nb.total, st->fifo.nb.gyro,

 -                                               gyro_ts);

 +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro, gyro_ts);

                 ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);

                 if (ret)

                         return ret;

         }

 

         if (st->fifo.nb.accel > 0) {

-                ts = iio_priv(st->indio_accel);

+                ts = &accel_st->ts;

 -               inv_sensors_timestamp_interrupt(ts, st->fifo.period,

 -                                               st->fifo.nb.total, st->fifo.nb.accel,

 -                                               accel_ts);

 +               inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel, accel_ts);

                 ret = inv_icm42600_accel_parse_fifo(st->indio_accel);

                 if (ret)

                         return ret;


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

* linux-next: manual merge of the iio tree with the iio-fixes tree
@ 2024-04-30  5:15 Stephen Rothwell
  2024-05-02  8:36 ` Jean-Baptiste Maneyrol
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-04-30  5:15 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Jean-Baptiste Maneyrol, Linux Kernel Mailing List,
	Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 2929 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c

between commit:

  d7230b995246 ("iio: invensense: fix timestamp glitches when switching frequency")

from the iio-fixes tree and commit:

  a1432b5b4f4c ("iio: imu: inv_icm42600: add support of ICM-42686-P")

from the iio 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/imu/inv_icm42600/inv_icm42600_buffer.c
index 9cde9a9337ad,cfb4a41ab7c1..000000000000
--- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
+++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
@@@ -509,20 -512,20 +512,20 @@@ int inv_icm42600_buffer_fifo_parse(stru
  		return 0;
  
  	/* handle gyroscope timestamp and FIFO data parsing */
 -	ts = &gyro_st->ts;
 -	inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
 -					st->fifo.nb.gyro, st->timestamp.gyro);
  	if (st->fifo.nb.gyro > 0) {
- 		ts = iio_priv(st->indio_gyro);
++		ts = &gyro_st->ts;
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro,
 +						st->timestamp.gyro);
  		ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
  		if (ret)
  			return ret;
  	}
  
  	/* handle accelerometer timestamp and FIFO data parsing */
 -	ts = &accel_st->ts;
 -	inv_sensors_timestamp_interrupt(ts, st->fifo.period, st->fifo.nb.total,
 -					st->fifo.nb.accel, st->timestamp.accel);
  	if (st->fifo.nb.accel > 0) {
- 		ts = iio_priv(st->indio_accel);
++		ts = &accel_st->ts;
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel,
 +						st->timestamp.accel);
  		ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
  		if (ret)
  			return ret;
@@@ -549,16 -554,20 +554,16 @@@ int inv_icm42600_buffer_hwfifo_flush(st
  		return 0;
  
  	if (st->fifo.nb.gyro > 0) {
- 		ts = iio_priv(st->indio_gyro);
+ 		ts = &gyro_st->ts;
 -		inv_sensors_timestamp_interrupt(ts, st->fifo.period,
 -						st->fifo.nb.total, st->fifo.nb.gyro,
 -						gyro_ts);
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro, gyro_ts);
  		ret = inv_icm42600_gyro_parse_fifo(st->indio_gyro);
  		if (ret)
  			return ret;
  	}
  
  	if (st->fifo.nb.accel > 0) {
- 		ts = iio_priv(st->indio_accel);
+ 		ts = &accel_st->ts;
 -		inv_sensors_timestamp_interrupt(ts, st->fifo.period,
 -						st->fifo.nb.total, st->fifo.nb.accel,
 -						accel_ts);
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel, accel_ts);
  		ret = inv_icm42600_accel_parse_fifo(st->indio_accel);
  		if (ret)
  			return ret;

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

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

* Re: linux-next: manual merge of the iio tree with the iio-fixes tree
  2021-10-01  3:38 Stephen Rothwell
@ 2021-10-01  8:27 ` Jonathan Cameron
  0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2021-10-01  8:27 UTC (permalink / raw)
  To: Stephen Rothwell, Linux Next Mailing List
  Cc: Billy Tsai, Linux Kernel Mailing List

On Fri, 1 Oct 2021 13:38:41 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the iio tree got a conflict in:
> 
>   drivers/iio/adc/aspeed_adc.c
> 
> between commit:
> 
>   eb795cd97365 ("iio: adc: aspeed: set driver data when adc probe.")
> 
> from the iio-fixes tree and commit:
> 
>   e96b152c6cc2 ("iio: adc: aspeed: Keep model data to driver data.")
> 
> from the iio 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.

Looks good to me.

Jonathan

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc drivers/iio/adc/aspeed_adc.c
> index 34ec0c28b2df,9e2c85c3cbe9..000000000000
> --- a/drivers/iio/adc/aspeed_adc.c
> +++ b/drivers/iio/adc/aspeed_adc.c
> @@@ -183,7 -492,7 +492,8 @@@ static int aspeed_adc_probe(struct plat
>   
>   	data = iio_priv(indio_dev);
>   	data->dev = &pdev->dev;
>  +	platform_set_drvdata(pdev, indio_dev);
> + 	data->model_data = of_device_get_match_data(&pdev->dev);
>   
>   	data->base = devm_platform_ioremap_resource(pdev, 0);
>   	if (IS_ERR(data->base))

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

* linux-next: manual merge of the iio tree with the iio-fixes tree
@ 2021-10-01  3:38 Stephen Rothwell
  2021-10-01  8:27 ` Jonathan Cameron
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2021-10-01  3:38 UTC (permalink / raw)
  To: Jonathan Cameron
  Cc: Billy Tsai, Linux Kernel Mailing List, Linux Next Mailing List

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  drivers/iio/adc/aspeed_adc.c

between commit:

  eb795cd97365 ("iio: adc: aspeed: set driver data when adc probe.")

from the iio-fixes tree and commit:

  e96b152c6cc2 ("iio: adc: aspeed: Keep model data to driver data.")

from the iio 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/adc/aspeed_adc.c
index 34ec0c28b2df,9e2c85c3cbe9..000000000000
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@@ -183,7 -492,7 +492,8 @@@ static int aspeed_adc_probe(struct plat
  
  	data = iio_priv(indio_dev);
  	data->dev = &pdev->dev;
 +	platform_set_drvdata(pdev, indio_dev);
+ 	data->model_data = of_device_get_match_data(&pdev->dev);
  
  	data->base = devm_platform_ioremap_resource(pdev, 0);
  	if (IS_ERR(data->base))

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

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

end of thread, other threads:[~2024-05-31  4:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-31  4:06 linux-next: manual merge of the iio tree with the iio-fixes tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2024-04-30  5:15 Stephen Rothwell
2024-05-02  8:36 ` Jean-Baptiste Maneyrol
2024-05-02  8:58   ` Jonathan Cameron
2021-10-01  3:38 Stephen Rothwell
2021-10-01  8:27 ` Jonathan Cameron

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).