Skip to contentSkip to conversation

When is net fixes getting merged into net-next and bpf-next

DISCUSSION Jesper Dangaard Brouer 2 participants 2 messages Mar 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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?

Signature · 4 lines
Best regards,
  Jesper Dangaard Brouer
  MSc.CS, Principal Kernel Engineer at Red Hat
  LinkedIn: http://www.linkedin.com/in/brouer
maintainer
#1 lore raw

From: Jesper Dangaard Brouer <[email protected]>
Date: Thu, 1 Mar 2018 18:45:57 +0100

Quoted 4 lines

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.