Le 31/07/2015 00:38, Stephen Rothwell a écrit :
> Hi Nicolas,
>
> Today's linux-next merge of the at91 tree got a conflict in:
>
> arch/arm/mach-at91/sama5.c
>
> between commit:
>
> 19c233b79d1a ("ARM: appropriate __init annotation for const data")
>
> from the arm-soc tree and commit:
>
> a6e41317b9b8 ("ARM: at91/soc: add basic support for new sama5d2 SoC")
>
> from the at91 tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
The merge is correct. Thanks Stephen!
Bye,
--
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
