Messages in this thread | | | Date | Wed, 01 Oct 2014 20:31:54 +0200 | From | Sebastian Hesselbarth <> | Subject | Re: linux-next: manual merge of the net-next tree with the berlin tree |
| |
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: berlin: enable the > Ethernet port on the BG2Q DMP") from the net-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me,
Thanks Stephen!
Sebastian
| |