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

On Fri, 20 Mar 2015 16:23:54 +1100 Stephen Rothwell wrote: > Today's linux-next merge of the spi tree got a conflict in > Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi: > spidev_test: Added functionalities") from the jc_docs tree and commits > b78ce7ed5409 ("spi: spidev_test:

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

On Fri, Mar 20, 2015 at 04:23:54PM +1100, Stephen Rothwell wrote: > Clearly the one commit in the jc_docs tree is supposed to do the same > as three commits in the spi tree. The jc_docs tree version has an > older Author date, but a newer commit date ... > I fixed it up (by using the spi tree ve

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

Hi all, On Fri, 20 Mar 2015 16:23:54 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the spi tree got a conflict in > Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi: > spidev_test: Added functionalities") from the jc_docs tree and commits > b78ce7ed5409 ("spi: sp

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

Hi Mark, Today's linux-next merge of the spi tree got a conflict in Documentation/spi/spidev_test.c between commit 988b22c519c8 ("spi: spidev_test: Added functionalities") from the jc_docs tree and commits b78ce7ed5409 ("spi: spidev_test: Cleaned hexadecimal dump"), 31a5c5a72b90 ("") and ("") fro