Received-SPF: pass (google.com: domain of linux-kernel+bounces-163355-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 30 Apr 2024 15:15:10 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
Cc: Jean-Baptiste Maneyrol <jean-baptiste.maneyrol@tdk.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 iio tree with the iio-fixes tree
Message-ID: <20240430151510.0f49b40e@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.9qz=rzYQ0tG4Q4QASCXUNi";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

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 fre=
quency")

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.

--=20
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;
 =20
  	/* handle gyroscope timestamp and FIFO data parsing */
 -	ts =3D &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 =3D iio_priv(st->indio_gyro);
++		ts =3D &gyro_st->ts;
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.gyro,
 +						st->timestamp.gyro);
  		ret =3D inv_icm42600_gyro_parse_fifo(st->indio_gyro);
  		if (ret)
  			return ret;
  	}
 =20
  	/* handle accelerometer timestamp and FIFO data parsing */
 -	ts =3D &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 =3D iio_priv(st->indio_accel);
++		ts =3D &accel_st->ts;
 +		inv_sensors_timestamp_interrupt(ts, st->fifo.nb.accel,
 +						st->timestamp.accel);
  		ret =3D 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;
 =20
  	if (st->fifo.nb.gyro > 0) {
- 		ts =3D iio_priv(st->indio_gyro);
+ 		ts =3D &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 =3D inv_icm42600_gyro_parse_fifo(st->indio_gyro);
  		if (ret)
  			return ret;
  	}
 =20
  	if (st->fifo.nb.accel > 0) {
- 		ts =3D iio_priv(st->indio_accel);
+ 		ts =3D &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 =3D inv_icm42600_accel_parse_fifo(st->indio_accel);
  		if (ret)
  			return ret;

--Sig_/.9qz=rzYQ0tG4Q4QASCXUNi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYwfl4ACgkQAVBC80lX
0GxF/Af/bS1heTqPtajMFr5YRwV0Pu5rFKzkPL8BxetX1YY/uXJX5yKXAoCc7r/1
2lS74WwxA8bAAnMTuILlsx8V+UVFkOxZJBoNpPBWVUsbZeSadgXExip/FR6ENalW
LxwkdGqwtEh3tG91BHHIaaTMatWJJ0MxwAzpYJNX6zOKdEHS+KV7J1DRRGQpTw/I
ZPmaJ+k5YLI8PBH/HiWe/1r2S274jv52cs+YdZvbsOIaPke0Lq4Qbn9giLdYXYnO
uTg+MKj/oClCg4RMimbyhhgFovCk6borju1Ch5pHqI/5GpM3TA5IS7cwT99jDLLP
JnhpHxniUAawvx1ka78j0glI5g0B8g==
=V3xp
-----END PGP SIGNATURE-----

--Sig_/.9qz=rzYQ0tG4Q4QASCXUNi--