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

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_v

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 a