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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 827 bytes --]

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                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 686 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

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 version of the file) and can carry
> the fix as necessary (no action is required).

That's the fix I'd expect, thanks.

> BTW, there is a function in there called "unespcape" whose comment
> calls it "Unescape" which would make more sense.

Probably, yes...

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

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

[Jonathan Corbet]

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.

Weird, I dropped all that; I wonder how I managed to undrop it?  Will do
so again, sorry for the trouble.

jon