* linux-next: please clean up the ipvs-next tree
@ 2018-08-06 2:49 Stephen Rothwell
2018-08-07 8:57 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2018-08-06 2:49 UTC (permalink / raw)
To: Simon Horman; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: please clean up the ipvs-next tree
2018-08-06 2:49 linux-next: please clean up the ipvs-next tree Stephen Rothwell
@ 2018-08-07 8:57 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2018-08-07 8:57 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Linux-Next Mailing List, Linux Kernel Mailing List
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-07 8:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-06 2:49 linux-next: please clean up the ipvs-next tree Stephen Rothwell
2018-08-07 8:57 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).