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

2021-02-22 Thread Stephen Rothwell
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

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

2021-02-12 Thread Stephen Rothwell
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

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

2021-02-12 Thread Mark Brown
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

2021-02-11 Thread Stephen Rothwell
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