Re: linux-next: manual merge of the iio tree with the iio-fixes tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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;






[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux