Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1205589

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

Show all headers | View raw

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@gondor.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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the crypto tree with the imx-mxs tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-12 05:30 +0200
  Re: linux-next: manual merge of the crypto tree with the imx-mxs tree Herbert Xu <herbert@gondor.apana.org.au> - 2015-08-12 07:20 +0200
    Re: linux-next: manual merge of the crypto tree with the imx-mxs tree Shawn Guo <shawn.guo@linaro.org> - 2015-08-12 07:50 +0200

csiph-web