From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752127AbbHRDO0 (ORCPT ); Mon, 17 Aug 2015 23:14:26 -0400 Received: from ozlabs.org ([103.22.144.67]:35552 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750992AbbHRDOY (ORCPT ); Mon, 17 Aug 2015 23:14:24 -0400 Date: Tue, 18 Aug 2015 13:14:23 +1000 From: Stephen Rothwell To: Jens Axboe , Herbert Xu Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Williams Subject: linux-next: manual merge of the block tree with the crypto tree Message-ID: <20150818131423.7728ecc7@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jens, Today's linux-next merge of the block tree got a conflict in: crypto/ccm.c between commit: 81c4c35eb61a ("crypto: ccm - Convert to new AEAD interface") from the crypto tree and commit: c56f6d1270b9 ("crypto: replace scatterwalk_sg_chain with sg_chain") from the block tree. I fixed it up (the former removed all the calls to scatterwalk_sg_chain) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au