Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933647AbbHLFk6 (ORCPT ); Wed, 12 Aug 2015 01:40:58 -0400 Received: from mail-io0-f172.google.com ([209.85.223.172]:36785 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933582AbbHLFk4 (ORCPT ); Wed, 12 Aug 2015 01:40:56 -0400 MIME-Version: 1.0 In-Reply-To: <20150812051830.GB6258@gondor.apana.org.au> References: <20150812132239.0ce1fe80@canb.auug.org.au> <20150812051830.GB6258@gondor.apana.org.au> Date: Wed, 12 Aug 2015 13:40:56 +0800 Message-ID: Subject: Re: linux-next: manual merge of the crypto tree with the imx-mxs tree From: Shawn Guo To: Herbert Xu Cc: Stephen Rothwell , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Victoria Milhoan , Shengjiu Wang Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1024 Lines: 32 Herbert, On Wed, Aug 12, 2015 at 1:18 PM, Herbert Xu wrote: > On Wed, Aug 12, 2015 at 01:22:39PM +1000, Stephen Rothwell wrote: >> >> 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). Please leave i.MX architecture patches (i.MX patches under arch/arm/) to me to handle in the future, so that we can avoid such unnecessary merge conflict. Shawn -- 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/