Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933393AbbHLDWp (ORCPT ); Tue, 11 Aug 2015 23:22:45 -0400 Received: from ozlabs.org ([103.22.144.67]:59848 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932684AbbHLDWn (ORCPT ); Tue, 11 Aug 2015 23:22:43 -0400 Date: Wed, 12 Aug 2015 13:22:39 +1000 From: Stephen Rothwell To: Herbert Xu , Shawn Guo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Victoria Milhoan , Shengjiu Wang Subject: linux-next: manual merge of the crypto tree with the imx-mxs tree Message-ID: <20150812132239.0ce1fe80@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 Content-Length: 741 Lines: 27 Hi Herbert, Today's linux-next merge of the crypto tree got a conflict in: arch/arm/configs/imx_v6_v7_defconfig between commit: 351265f46291 ("ARM: imx_v6_v7_defconfig: build in audio driver") from the imx-mxs tree and commit: ab86ca0755ec ("ARM: imx_v6_v7_defconfig: Select CAAM") from the crypto tree. I fixed it up (they both removed the same line) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/