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

On Thu, Jun 04, 2015 at 04:55:29PM +1000, Stephen Rothwell wrote: > Today's linux-next merge of the edac-amd tree got a conflict in > arch/x86/Kconfig between commit 6471b825c41e ("x86/kconfig: Reorganize > arch feature Kconfig select's") from the tip tree and commit > b01aec9b2c7d ("EDAC: Cleanup

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

Hi Borislav, Today's linux-next merge of the edac-amd tree got a conflict in arch/x86/Kconfig between commit 6471b825c41e ("x86/kconfig: Reorganize arch feature Kconfig select's") from the tip tree and commit b01aec9b2c7d ("EDAC: Cleanup atomic_scrub mess") from the edac-amd tree. I fixed it up (