* When is net fixes getting merged into net-next and bpf-next
@ 2018-03-01 17:45 Jesper Dangaard Brouer
2018-03-01 18:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jesper Dangaard Brouer @ 2018-03-01 17:45 UTC (permalink / raw)
To: David Miller, Alexei Starovoitov, Daniel Borkmann; +Cc: brouer, netdev
Hi Maintainers,
I'm working on a patchset based on bpf-next, but I'm starting to
conflict with my own fixes patches that are only in the net git tree...
When is net fixes getting merged into net-next and bpf-next?
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: When is net fixes getting merged into net-next and bpf-next
2018-03-01 17:45 When is net fixes getting merged into net-next and bpf-next Jesper Dangaard Brouer
@ 2018-03-01 18:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-03-01 18:06 UTC (permalink / raw)
To: brouer; +Cc: alexei.starovoitov, borkmann, netdev
From: Jesper Dangaard Brouer <brouer@redhat.com>
Date: Thu, 1 Mar 2018 18:45:57 +0100
> Hi Maintainers,
>
> I'm working on a patchset based on bpf-next, but I'm starting to
> conflict with my own fixes patches that are only in the net git tree...
net got merged into net-next just last weekend
I only merge net into net-next when I send a pull request to Linus, he
takes it, and I can fast forward net.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-01 18:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-01 17:45 When is net fixes getting merged into net-next and bpf-next Jesper Dangaard Brouer
2018-03-01 18:06 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.