Hi Daniel, The clockevents tree appears to only contain an old version of patches that have been committed upstream. As such, it is only causing conflicts. Please resync with your upstream tree.
-- Cheers, Stephen Rothwell
pgpMJOgR6ztsr.pgp
Description: OpenPGP digital signature