On Tue, 31 Jul 2018 at 23:45, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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).
>
Absolutely - right away.
Mathieu
> --
> Cheers,
> Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
