Subject: Re: linux-next: manual merge of the spi tree with the powerpc tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 23 Feb 2021 10:57:06 +1100

Hi Stephen,

On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> Hi all,
> 
> Today's linux-next merge of the spi tree got a conflict in:
> 
>   drivers/spi/spi-mpc52xx.c
> 
> between commit:
> 
>   e10656114d32 ("spi: mpc52xx: Avoid using get_tbl()")
> 
> from the powerpc tree and commit:
> 
>   258ea99fe25a ("spi: spi-mpc52xx: Use new structure for SPI transfer delays")
> 
> from the spi 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.
> 
> 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 == 0) {
>  -		ms->timestamp = get_tbl();
>  +		ms->timestamp = mftb();
> - 		ms->timestamp += ms->transfer->delay_usecs * tb_ticks_per_usec;
> + 		if (ms->transfer->delay.unit == SPI_DELAY_UNIT_USECS)
> + 			ms->timestamp += ms->transfer->delay.value *
> + 					 tb_ticks_per_usec;
>   		ms->state = mpc52xx_spi_fsmstate_wait;
>   		return FSM_CONTINUE;
>   	}

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

-- 
Cheers,
Stephen Rothwell