Re: linux-next: manual merge of the edac-amd tree with the pci tree

On Thu, Jun 11, 2015 at 03:28:53PM +1000, Stephen Rothwell wrote: > Hi Borislav, > > Today's linux-next merge of the edac-amd tree got a conflict in > arch/arm64/boot/dts/apm/apm-storm.dtsi between commit e1e6e5c4de24 > ("arm64: dts: Add APM X-Gene PCIe MSI nodes") from the tree and commit > 8f2a

linux-next: manual merge of the edac-amd tree with the pci tree

Hi Borislav, Today's linux-next merge of the edac-amd tree got a conflict in arch/arm64/boot/dts/apm/apm-storm.dtsi between commit e1e6e5c4de24 ("arm64: dts: Add APM X-Gene PCIe MSI nodes") from the tree and commit 8f2ae6f30d5e ("arm64: Add APM X-Gene SoC EDAC DTS entries") from the edac-amd tree