Re: linux-next: manual merge of the net-next tree with the berlin tree

2014-10-01 Thread Sebastian Hesselbarth
On 01.10.2014 03:22, Stephen Rothwell wrote: Today's linux-next merge of the net-next tree got a conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts between commit 461316fca705 ("ARM: berlin: enable the eSATA interface on the BG2Q DMP") from the berlin tree and commit 75215193b975 ("ARM: dts:

linux-next: manual merge of the net-next tree with the berlin tree

2014-09-30 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in arch/arm/boot/dts/berlin2q-marvell-dmp.dts between commit 461316fca705 ("ARM: berlin: enable the eSATA interface on the BG2Q DMP") from the berlin tree and commit 75215193b975 ("ARM: dts: berlin: enable the Ethernet port on th