linux-kernel - Re: linux-next: manual merge of the staging tree with the crypto tree

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: <20160223013636.GB761@kroah.com>
Date:	Mon, 22 Feb 2016 17:36:36 -0800
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Herbert Xu <herbert@...dor.apana.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Oleg Drokin <green@...uxhacker.ru>
Subject: Re: linux-next: manual merge of the staging tree with the crypto tree

On Mon, Feb 22, 2016 at 02:55:25PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
> 
> between commit:
> 
>   6dae10001e84 ("staging: lustre: Use ahash")
> 
> from the crypto tree and commit:
> 
>   15d9f5201fc3 ("staging/lustre/libcfs: Adjust NULL comparison codestyle")
>   3e1f3db1b29b ("staging/lustre: Remove space after cast in cfs_crypto_hash_final()")
> 
> from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h