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 at intel.com> > Signed-off-by: Ley Foon Tan <ley.foon.tan at intel.com> > > Conflicts: > arch/arm/mach-socfpga/clock_manager.c ^ what's this "conflicts" about ? -- Best regards, Marek Vasut