linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-ID: <20150320163046.01ef5023@canb.auug.org.au>
Date:	Fri, 20 Mar 2015 16:30:46 +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: 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@...b.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@...b.auug.org.au

Content of type "application/pgp-signature" skipped