Daniel Borkmann <daniel@xxxxxxxxxxxxx> writes: > On 06/14/2019 03:09 PM, Toke Høiland-Jørgensen wrote: >> Toshiaki Makita <toshiaki.makita1@xxxxxxxxx> writes: > [...] >>>> Alternatively, since this entire series should probably go to stable, I >>>> can respin mine on top of it? >>> >>> Indeed conflict will happen, as this is for 'bpf' not 'bpf-next'. >>> Sorry for disturbing your work. >> >> Oh, no worries! >> >>> I'm also not sure how to proceed in this case. >> >> I guess we'll leave that up to the maintainers :) > > So all three look good to me, I've applied them to bpf tree. Fixes to > bpf do have precedence over patches to bpf-next given they need to > land in the current release. I'll get bpf out later tonight and ask > David to merge net into net-next after that since rebase is also > needed for Stanislav's cgroup series. We'll then flush out bpf-next so > we can fast-fwd to net-next to pull in all the dependencies. Right, I'll wait for that, then rebase my series and resubmit -Toke
