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

[Bart Van Assche]

On 06/01/17 21:03, Nicholas A. Bellinger wrote:
> On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote:
> > Last night the target-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.
>
> Unfortunately, this is going to continue to be a problem once these
> patches are list reviewed, and included in target-updates.
>
> Bart, can you please drop the patches?
Hello Stephen and Nic,

I have just reset that branch to v4.12-rc1. Sorry for the inconvenience.

Bart.