[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <87r27v9n2f.fsf@toke.dk>
Date: Sat, 15 Jun 2019 12:10:00 +0200
From: Toke Høiland-Jørgensen <toke@...hat.com>
To: Daniel Borkmann <daniel@...earbox.net>,
Toshiaki Makita <toshiaki.makita1@...il.com>,
Alexei Starovoitov <ast@...nel.org>,
"David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <jakub.kicinski@...ronome.com>,
Jesper Dangaard Brouer <hawk@...nel.org>,
John Fastabend <john.fastabend@...il.com>
Cc: netdev@...r.kernel.org, xdp-newbies@...r.kernel.org,
bpf@...r.kernel.org, "Michael S. Tsirkin" <mst@...hat.com>,
Jason Wang <jasowang@...hat.com>,
David Ahern <dsahern@...il.com>
Subject: Re: [PATCH bpf 1/3] devmap: Fix premature entry free on destroying map
Daniel Borkmann <daniel@...earbox.net> writes:
> On 06/14/2019 03:09 PM, Toke Høiland-Jørgensen wrote:
>> Toshiaki Makita <toshiaki.makita1@...il.com> 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
Powered by blists - more mailing lists