On Fri, 2017-06-02 at 13:39 +1000, Stephen Rothwell wrote: > 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. > 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 until they are list reviewed so there isn't a constant stream of merge conflicts in linux-next for your un-reviewed code..? -- 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
