On 20/12/2018 06:15, Stephen Rothwell wrote: > Hi Daniel, > > It looks like all the changes in the clockevents tree appear as other > commits in other tree(s). Could you please reset your tree to somewhere > in your upstream tree as it is beginning to produce conflicts. Done. -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
