linux-kernel - Re: linux-next: manual merge of the crypto tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150812051830.GB6258@gondor.apana.org.au>
Date:	Wed, 12 Aug 2015 13:18:30 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Shawn Guo <shawn.guo@...aro.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Victoria Milhoan <vicki.milhoan@...escale.com>,
	Shengjiu Wang <shengjiu.wang@...escale.com>
Subject: Re: linux-next: manual merge of the crypto tree with the imx-mxs tree

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).

Thanks Stephen.
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/