Subject: linux-next: upcoming conflict between the target-updates and target-bva trees

From: Stephen Rothwell <[email-masked]>
Date: Fri, 2 Jun 2017 13:39:28 +1000

Hi all,

Last night the tagret-bva tree was rebased on top of the target-updates
tree.  Just now, part of the target-updates tree has been rewritten.
So now I expect to get conflict(s) when I merge these trees since the
commits in the target-updates tree are no longer the same as those that
the target-bva tree was rebased on top of.

Please take a little time to sort out your development process.

-- 
Cheers,
Stephen Rothwell