Hi Mathieu,

All but the last 9 commits in the coresight tree have been merged into
the char-misc tree as different commits (they were sent to Greg as a
patch series rather than a merge request).  Can you please rebase your
tree into commit ccff2dfaceac ("coresight: tpiu: Fix disabling timeouts")
from the char-misc tree to avoid further conflicts (and duplication if
you ask Greg to merge your tree rather than take a patch series).

-- 
Cheers,
Stephen Rothwell