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 ("") from the spi tree.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 version of the file) and can carry the fix as necessary (no action is required). BTW, there is a function in there called "unespcape" whose comment calls it "Unescape" which would make more sense. -- Cheers, Stephen Rothwell [email protected]
pgp8FA_KBv44S.pgp
Description: OpenPGP digital signature
