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

Greg KH
2016-02-23T01:36:36Z

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