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

2012-11-15 Thread Grant Likely
On Thu, Nov 15, 2012 at 4:01 AM, Stephen Rothwell wrote: > Hi Grant, > > Today's linux-next merge of the spi tree got a conflict in > drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add > AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit > 0e312dcca718 ("spi/xcomm: Add

linux-next: manual merge of the spi tree with Linus' tree

2012-11-14 Thread Stephen Rothwell
Hi Grant, Today's linux-next merge of the spi tree got a conflict in drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit 0e312dcca718 ("spi/xcomm: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from the spi tree. OK, so t