Re: linux-next: please clean up the ipvs-next tree

2018-08-07 Thread Simon Horman
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 fi

linux-next: please clean up the ipvs-next tree

2018-08-05 Thread Stephen Rothwell
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. -- Cheers, Stephen Rothwell pgpIl_KCDzubv.pgp Description: OpenPGP digital signature