Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 23 Feb 2021 10:57:06 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Michael Ellerman <mpe@ellerman.id.au>,
        PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc:     Mark Brown <broonie@kernel.org>,
        Christophe Leroy <christophe.leroy@csgroup.eu>,
        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 spi tree with the powerpc tree
Message-ID: <20210223105706.1a57be06@canb.auug.org.au>
In-Reply-To: <20210212152755.5c82563a@canb.auug.org.au>
References: <20210212152755.5c82563a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/NYDmyQxYEcZbJPIOnMi8qJp";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/NYDmyQxYEcZbJPIOnMi8qJp
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Stephen,

On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Hi all,
>=20
> Today's linux-next merge of the spi tree got a conflict in:
>=20
>   drivers/spi/spi-mpc52xx.c
>=20
> between commit:
>=20
>   e10656114d32 ("spi: mpc52xx: Avoid using get_tbl()")
>=20
> from the powerpc tree and commit:
>=20
>   258ea99fe25a ("spi: spi-mpc52xx: Use new structure for SPI transfer del=
ays")
>=20
> from the spi tree.
>=20
> 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
> diff --cc drivers/spi/spi-mpc52xx.c
> index e6a30f232370,36f941500676..000000000000
> --- a/drivers/spi/spi-mpc52xx.c
> +++ b/drivers/spi/spi-mpc52xx.c
> @@@ -247,8 -247,10 +247,10 @@@ static int mpc52xx_spi_fsmstate_transfe
>   	/* Is the transfer complete? */
>   	ms->len--;
>   	if (ms->len =3D=3D 0) {
>  -		ms->timestamp =3D get_tbl();
>  +		ms->timestamp =3D mftb();
> - 		ms->timestamp +=3D ms->transfer->delay_usecs * tb_ticks_per_usec;
> + 		if (ms->transfer->delay.unit =3D=3D SPI_DELAY_UNIT_USECS)
> + 			ms->timestamp +=3D ms->transfer->delay.value *
> + 					 tb_ticks_per_usec;
>   		ms->state =3D mpc52xx_spi_fsmstate_wait;
>   		return FSM_CONTINUE;
>   	}

This is now a conflict between the powerpc tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/NYDmyQxYEcZbJPIOnMi8qJp
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmA0RNIACgkQAVBC80lX
0GxdFggAlfolbgn5bq51VTyZ+1tyiXa8aezsnmPSQvuwqiHkoa3ZPjBersgqLAul
MH9DvEjqXpvRnFIqiDoeTmUA/tc4HYNncv+s/NrV+iBjwmtCoK5umm5kdwjgENGL
nh5BnuIRG9mFSo/KKrHhhJYgJ1PwLC0uto5ou7fw7eLf5RqYlK/mx1Gl/kBWojgx
NvxY8QE6iXyE+4pSaXo/rOR45n5VwrczgnKE8LsY79yNXfpYTPkQYoS/tGqAPh9K
m3KcGO9Y2co27EO8YPw1KXNAhDW3k5uNCAqoapnnPKcKnx1zrDOxMhflo8XMNPU2
LvtNSsm091rgYgW4c9s0JYQTLphTtw==
=GXwL
-----END PGP SIGNATURE-----

--Sig_/NYDmyQxYEcZbJPIOnMi8qJp--