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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20150320074106.74ed3ba5@lwn.net>
Date:	Fri, 20 Mar 2015 07:41:06 -0600
From:	Jonathan Corbet <corbet@....net>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mark Brown <broonie@...nel.org>, 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

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.

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

jon
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/