Re: linux-next: manual merge of the spi tree with the powerpc tree
Hi Stephen, On Fri, 12 Feb 2021 15:31:42 +1100 Stephen Rothwell 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.. > --- 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 pgp3YqnBZzZgW.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the spi tree with the powerpc tree
Hi Mark, On Fri, 12 Feb 2021 12:27:59 + Mark Brown 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 To: , , Cc: Sergiu Cuciurean So I am suprised that it was received by anyone. Maybe gmane has an internal reply system that is screwed. -- Cheers, Stephen Rothwell pgpwdZmSquIk5.pgp Description: OpenPGP digital signature
Re: linux-next: manual merge of the spi tree with the powerpc tree
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. signature.asc Description: PGP signature
linux-next: manual merge of the spi tree with the powerpc tree
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 :-( -- Cheers, Stephen Rothwell diff --cc drivers/spi/spi-mpc52xx.c index e6a30f232370,36f941500676.. --- 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; } pgp5F9M5sQSJb.pgp Description: OpenPGP digital signature