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 S1757345AbcBRXu0 (ORCPT <rfc822;w@1wt.eu>);
	Thu, 18 Feb 2016 18:50:26 -0500
Received: from ozlabs.org ([103.22.144.67]:58702 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1948803AbcBRXt6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 18 Feb 2016 18:49:58 -0500
Date: Fri, 19 Feb 2016 10:49:57 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Insu Yun <wuninsu@gmail.com>
Subject: linux-next: manual merge of the crypto tree with the net tree
Message-ID: <20160219104957.0273c75a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Herbert,

Today's linux-next merge of the crypto tree got a conflict in:

  net/ipv4/tcp.c

between commit:

  1eea84b74cd2 ("tcp: correctly crypto_alloc_hash return check")

from the net tree and commit:

  cf80e0e47e0e ("tcp: Use ahash")

from the crypto tree.

I fixed it up (the latter removed the code fixed by the former) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell