From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14423C31E51 for ; Sat, 15 Jun 2019 10:10:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E66BE2184E for ; Sat, 15 Jun 2019 10:10:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726921AbfFOKKF convert rfc822-to-8bit (ORCPT ); Sat, 15 Jun 2019 06:10:05 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:46329 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726893AbfFOKKE (ORCPT ); Sat, 15 Jun 2019 06:10:04 -0400 Received: by mail-ed1-f67.google.com with SMTP id d4so7371692edr.13 for ; Sat, 15 Jun 2019 03:10:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=E5g/m2oNw0FmOnRwBHRfp/fjjyfTq1G4GJO9NWyBiak=; b=Pop3jTbkpg2c9rOdgGtksEa/wSDwhAKnjSy4XqyNBWxH1ksi02x8W0ZB8UIYUh/K7z vnFPhD93EZqW4LzP7MWiUnedCc9unDaCtb+TXxVs4NB/F70tFBTD1HxmwlsAkQnS5oBG NVZyBlarkPYwXux28XRx9++ohEGhg5iJ0uzHt8xH+d5WlyGVSAVSC84sllkTbL5GGbeF wCh+fk/9RagM3vMjxUqcgMbFbFoI1nsHQ75XHU61on+wH0fY1VtCQdSqcy+j+g+cT0lc X1wUEy7l7Jaf2Mzzuf5UR9qNFM4LNEZ0YcLSGGDGA9BHKN9wOqOYvvdHg1cMuZIk/vIY kv7g== X-Gm-Message-State: APjAAAUUA/uZqhFOmDxPEooC1sfLEYy9tnTS3ss+7fYvEGbn+cVRiHTz +9hYP7/zqjqQVMfLkaVG4DQvpA== X-Google-Smtp-Source: APXvYqzCPAU0G5SPBb3xNUalstBRFbSLtXj+BEgB2SaVj0rv4Pog5MGdF0GDUelBpwAAa2JHfqQ8Qg== X-Received: by 2002:a50:8974:: with SMTP id f49mr52230644edf.95.1560593402393; Sat, 15 Jun 2019 03:10:02 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (borgediget.toke.dk. [85.204.121.218]) by smtp.gmail.com with ESMTPSA id k51sm1753562edb.7.2019.06.15.03.10.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 15 Jun 2019 03:10:01 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 013981804AF; Sat, 15 Jun 2019 12:10:00 +0200 (CEST) From: Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= To: Daniel Borkmann , Toshiaki Makita , Alexei Starovoitov , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend Cc: netdev@vger.kernel.org, xdp-newbies@vger.kernel.org, bpf@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , David Ahern Subject: Re: [PATCH bpf 1/3] devmap: Fix premature entry free on destroying map In-Reply-To: <5f6efec8-87f8-4ac5-46ee-47788dbf1d44@iogearbox.net> References: <20190614082015.23336-1-toshiaki.makita1@gmail.com> <20190614082015.23336-2-toshiaki.makita1@gmail.com> <877e9octre.fsf@toke.dk> <87sgscbc5d.fsf@toke.dk> <87muikb9ev.fsf@toke.dk> <5f6efec8-87f8-4ac5-46ee-47788dbf1d44@iogearbox.net> X-Clacks-Overhead: GNU Terry Pratchett Date: Sat, 15 Jun 2019 12:10:00 +0200 Message-ID: <87r27v9n2f.fsf@toke.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Daniel Borkmann writes: > On 06/14/2019 03:09 PM, Toke Høiland-Jørgensen wrote: >> Toshiaki Makita 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