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.

-- 
Cheers,
Stephen Rothwell