Messages in this thread |  | | Date | Fri, 20 Mar 2015 16:30:46 +1100 | | From | Stephen Rothwell <> | | Subject | 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 <sfr@canb.auug.org.au> 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: Cleaned hexadecimal dump"), > 31a5c5a72b90 ("") and ("") from the spi tree.
I got distracted in the middle of writing the email :-)
31a5c5a72b90 ("spi: spidev_test: Added verbose output") and 30061915be6e ("spi: spidev_test: Added input buffer from the terminal")
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] |  |