Re: [U-Boot] [PATCH v3 07/19] arm: socfpga: Add clock driver for Arria 10

On 03/30/2017 03:08 PM, Ley Foon Tan wrote:

Add clock driver support for Arria 10.

Signed-off-by: Tien Fong Chee tien.fong.chee@intel.com Signed-off-by: Ley Foon Tan ley.foon.tan@intel.com

Conflicts: arch/arm/mach-socfpga/clock_manager.c

^ what's this "conflicts" about ?