Received-SPF: pass (google.com: domain of linux-kernel+bounces-166188-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Thu, 2 May 2024 09:58:34 +0100
From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Jean-Baptiste Maneyrol <Jean-Baptiste.Maneyrol@tdk.com>
CC: Stephen Rothwell <sfr@canb.auug.org.au>, Linux Kernel Mailing List
	<linux-kernel@vger.kernel.org>, Linux Next Mailing List
	<linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the iio tree with the iio-fixes
 tree
Message-ID: <20240502095834.00000e7c@Huawei.com>
In-Reply-To: <FR3P281MB1757A0D3F821CF506D79634ECE182@FR3P281MB1757.DEUP281.PROD.OUTLOOK.COM>
References: <20240430151510.0f49b40e@canb.auug.org.au>
	<FR3P281MB1757A0D3F821CF506D79634ECE182@FR3P281MB1757.DEUP281.PROD.OUTLOOK.COM>
Organization: Huawei Technologies Research and Development (UK) Ltd.
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: quoted-printable

=20

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

> Hello Stephen and Jonathan,
>=20
> sorry for the mess, I should have warned Jonathan about it.
>=20
> The manual fix is obviously correct, no problem.
>=20
> 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


>=20
>=20
> ________________________________________
> From:=A0Stephen Rothwell
> Sent:=A0Tuesday, April 30, 2024 07:15
> To:=A0Jonathan Cameron
> Cc:=A0Jean-Baptiste Maneyrol; Linux Kernel Mailing List; Linux Next Maili=
ng List
> Subject:=A0linux-next: manual merge of the iio tree with the iio-fixes tr=
ee
>=20
>=20
> Hi all,
>=20
>=20
>=20
> Today's linux-next merge of the iio tree got a conflict in:
>=20
>=20
>=20
> =A0 drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
>=20
>=20
>=20
> between commit:
>=20
>=20
>=20
> =A0 d7230b995246 ("iio: invensense: fix timestamp glitches when switching=
 frequency")
>=20
>=20
>=20
> from the iio-fixes tree and commit:
>=20
>=20
>=20
> =A0 a1432b5b4f4c ("iio: imu: inv_icm42600: add support of ICM-42686-P")
>=20
>=20
>=20
> from the iio tree.
>=20
>=20
>=20
> I fixed it up (see below) and can carry the fix as necessary. This
>=20
> is now fixed as far as linux-next is concerned, but any non trivial
>=20
> conflicts should be mentioned to your upstream maintainer when your tree
>=20
> is submitted for merging.=A0 You may also want to consider cooperating
>=20
> with the maintainer of the conflicting tree to minimise any particularly
>=20
> complex conflicts.
>=20
>=20
>=20
> --
>=20
> Cheers,
>=20
> Stephen Rothwell
>=20
>=20
>=20
> diff --cc drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
>=20
> index 9cde9a9337ad,cfb4a41ab7c1..000000000000
>=20
> --- a/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
>=20
> +++ b/drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c
>=20
> @@@ -509,20 -512,20 +512,20 @@@ int inv_icm42600_buffer_fifo_parse(stru
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 return 0;
>=20
> =A0
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 /* handle gyroscope timestamp and FIFO data pars=
ing */
>=20
> =A0-=A0=A0=A0=A0=A0=A0 ts =3D &gyro_st->ts;
>=20
> =A0-=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_interrupt(ts, st->fifo.perio=
d, st->fifo.nb.total,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->fifo.nb.gyro, st->timesta=
mp.gyro);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 if (st->fifo.nb.gyro > 0) {
>=20
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D iio_priv(st->indio_=
gyro);
>=20
> ++=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D &gyro_st->ts;
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.nb.gyro,
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->t=
imestamp.gyro);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D inv_icm42600_gyr=
o_parse_fifo(st->indio_gyro);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (ret)
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
return ret;
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 }
>=20
> =A0
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 /* handle accelerometer timestamp and FIFO data =
parsing */
>=20
> =A0-=A0=A0=A0=A0=A0=A0 ts =3D &accel_st->ts;
>=20
> =A0-=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_interrupt(ts, st->fifo.perio=
d, st->fifo.nb.total,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->fifo.nb.accel, st->timest=
amp.accel);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 if (st->fifo.nb.accel > 0) {
>=20
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D iio_priv(st->indio_=
accel);
>=20
> ++=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D &accel_st->ts;
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.nb.accel,
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->t=
imestamp.accel);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D inv_icm42600_acc=
el_parse_fifo(st->indio_accel);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (ret)
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
return ret;
>=20
> @@@ -549,16 -554,20 +554,16 @@@ int inv_icm42600_buffer_hwfifo_flush(st
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 return 0;
>=20
> =A0
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 if (st->fifo.nb.gyro > 0) {
>=20
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D iio_priv(st->indio_=
gyro);
>=20
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D &gyro_st->ts;
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.period,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->f=
ifo.nb.total, st->fifo.nb.gyro,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 gyro_=
ts);
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.nb.gyro, gyro_ts);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D inv_icm42600_gyr=
o_parse_fifo(st->indio_gyro);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (ret)
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
return ret;
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 }
>=20
> =A0
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0 if (st->fifo.nb.accel > 0) {
>=20
> -=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D iio_priv(st->indio_=
accel);
>=20
> +=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ts =3D &accel_st->ts;
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.period,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 st->f=
ifo.nb.total, st->fifo.nb.accel,
>=20
> =A0-=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 accel=
_ts);
>=20
> =A0+=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 inv_sensors_timestamp_inte=
rrupt(ts, st->fifo.nb.accel, accel_ts);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 ret =3D inv_icm42600_acc=
el_parse_fifo(st->indio_accel);
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 if (ret)
>=20
> =A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 =
return ret;
>=20