diff mbox series

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

Message ID 20210212152755.5c82563a@canb.auug.org.au (mailing list archive)
State Not Applicable
Headers show
Series linux-next: manual merge of the spi tree with the powerpc tree | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/merge (626a6c3d2e20da80aaa710104f34ea6037b28b33)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/next (6895c5ba7bdcc55eacad03cf309ab23be63b9cac)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linus/master (92bf22614b21a2706f4993b278017e437f7785b3)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch powerpc/fixes (24321ac668e452a4942598533d267805f291fdc9)
snowpatch_ozlabs/apply_patch warning Failed to apply on branch linux-next (1e0d27fce010b0a4a9e595506b6ede75934c31be)
snowpatch_ozlabs/apply_patch fail Failed to apply to any branch

Commit Message

Stephen Rothwell Feb. 12, 2021, 4:31 a.m. UTC 
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.

BTW Mark: the author's address in 258ea99fe25a uses a non existent domain :-(

Comments

Mark Brown Feb. 12, 2021, 12:27 p.m. UTC | #1 
On Fri, Feb 12, 2021 at 03:31:42PM +1100, Stephen Rothwell wrote:

> BTW Mark: the author's address in 258ea99fe25a uses a non existent domain :-(

Ugh, I think that's something gone wrong with b4 :(  A bit late now to
try to fix it up.
Stephen Rothwell Feb. 13, 2021, 1:58 a.m. UTC | #2 
Hi Mark,

On Fri, 12 Feb 2021 12:27:59 +0000 Mark Brown <broonie@kernel.org> wrote:
>
> On Fri, Feb 12, 2021 at 03:31:42PM +1100, Stephen Rothwell wrote:
> 
> > BTW Mark: the author's address in 258ea99fe25a uses a non existent domain :-(  
> 
> Ugh, I think that's something gone wrong with b4 :(  A bit late now to
> try to fix it up.

Not sure about that, the email (following the link to lore from the
commit) has the same address (...@public.gmane.com) and that domain
does not exist. In fact the email headers (in lore) look like this:

From: Sergiu Cuciurean <sergiu.cuciurean-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>
To: <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	<linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: Sergiu Cuciurean
	<sergiu.cuciurean-OyLXuOCK7orQT0dZR+AlfA@public.gmane.org>

So I am suprised that it was received by anyone.  Maybe gmane has an
internal reply system that is screwed.
Stephen Rothwell Feb. 22, 2021, 11:57 p.m. UTC | #3 
Hi Stephen,

On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.
diff mbox series

Patch

diff --cc drivers/spi/spi-mpc52xx.c
index e6a30f232370,36f941500676..000000000000
--- a/drivers/spi/spi-mpc52xx.c