2015-08-12 03:22:45

by Stephen Rothwell

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

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 [email protected]

2015-08-12 05:18:46

by Herbert Xu

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 <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2015-08-12 05:40:58

by Shawn Guo

Subject: 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 <[email protected]> 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