lkml.org 
[lkml]   [2015]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the at91 tree with the arm-soc tree
Le 20/05/2015 02:08, Stephen Rothwell a écrit :
> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in
> arch/arm/configs/multi_v7_defconfig between commit 7b57472fb6cb ("ARM:
> multi_v7_defconfig: enable asm and NEON accelerated crypto modules")
> from the arm-soc tree and commit 822cfdfb9511 ("ARM:
> multi_v7_defconfig: Add Atmel SAMA5 family") from the at91 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix seems perfect: thanks Stephen.

Bye,
--
Nicolas Ferre


\
 
 \ /
  Last update: 2015-05-20 10:21    [W:0.023 / U:3.256 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site