On Mon, Aug 06, 2018 at 12:49:28PM +1000, Stephen Rothwell wrote: > Hi Simon, > > The ipvs-next tree appears to contain a set of patches that have been > merged into the net-next tree as different commits (some of them > slightly different). This is just causing conflicts. Thanks Stephen, I'll fix that. -- 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