linux-next: manual merge of the at91 tree with the arm-soc tree

2017-06-04 Thread Stephen Rothwell
Hi Nicolas, Today's linux-next merge of the at91 tree got a conflict in: arch/arm/mach-at91/Kconfig between commit: cc7a938f5f30 ("ARM: at91: select CONFIG_ARM_CPU_SUSPEND") from the arm-soc tree and commit: 81c0bb0b6ad1 ("ARM: at91: Add armv7m support") from the at91 tree. I fixed it

RE: linux-next: manual merge of the at91 tree with the arm-soc tree

2017-04-20 Thread Nicolas.Ferre
> Hi Nicolas, > > Today's linux-next merge of the at91 tree got a conflict in: > > arch/arm/boot/dts/at91-tse850-3.dts > between commit: > > e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia > TSE-850") > > from the arm-soc tree and commit: > > 29dd89418007 ("ARM: dts: at9

linux-next: manual merge of the at91 tree with the arm-soc tree

2017-04-19 Thread Stephen Rothwell
Hi Nicolas, Today's linux-next merge of the at91 tree got a conflict in: arch/arm/boot/dts/at91-tse850-3.dts between commit: e67cedc92812 ("ARM: dts: at91: add envelope detector mux to the Axentia TSE-850") from the arm-soc tree and commit: 29dd89418007 ("ARM: dts: at91: add envelope d

Re: linux-next: manual merge of the at91 tree with the arm-soc tree

2015-07-31 Thread Nicolas Ferre
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: >

linux-next: manual merge of the at91 tree with the arm-soc tree

2015-07-30 Thread Stephen Rothwell
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")

Re: linux-next: manual merge of the at91 tree with the arm-soc tree

2015-05-20 Thread Nicolas Ferre
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

linux-next: manual merge of the at91 tree with the arm-soc tree

2015-05-19 Thread Stephen Rothwell
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 SAM