From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756924AbcBWBgk (ORCPT <rfc822;w@1wt.eu>);
	Mon, 22 Feb 2016 20:36:40 -0500
Received: from out4-smtp.messagingengine.com ([66.111.4.28]:39356 "EHLO
	out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1756907AbcBWBgi (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 22 Feb 2016 20:36:38 -0500
X-Sasl-enc: WLAX6QIGBmbyCM8X33Wneml53QN/YHjjoa6EeXUWJZua 1456191397
Date: Mon, 22 Feb 2016 17:36:36 -0800
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Herbert Xu <herbert@gondor.apana.org.au>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Oleg Drokin <green@linuxhacker.ru>
Subject: Re: linux-next: manual merge of the staging tree with the crypto tree
Message-ID: <20160223013636.GB761@kroah.com>
References: <20160222145525.3d32f803@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20160222145525.3d32f803@canb.auug.org.au>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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