linux-kernel - linux-next: manual merge of the spi tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150320162354.3ed4a511@canb.auug.org.au>
Date:	Fri, 20 Mar 2015 16:23:54 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nel.org>, Jonathan Corbet <corbet@....net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Adrian Remonda <adrianremonda@...il.com>
Subject: 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  ("") 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped