From patchwork Sun Nov 24 23:58:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1200021 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="DwrhTfKN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47LnFJ6S73z9sR0 for ; Mon, 25 Nov 2019 10:59:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727091AbfKXX6w (ORCPT ); Sun, 24 Nov 2019 18:58:52 -0500 Received: from ozlabs.org ([203.11.71.1]:51779 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726803AbfKXX6w (ORCPT ); Sun, 24 Nov 2019 18:58:52 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47LnF30Brfz9sPn; Mon, 25 Nov 2019 10:58:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1574639928; bh=OAVbe2yC0rx13soTDnUOVwUCtkL0XiHFd05I/rKPaWI=; h=Date:From:To:Cc:Subject:From; b=DwrhTfKNn2GaUQjImkc4EHkBrFoupiFqH3pq2omtgqjy5OIe2YHaOHUvNWKxWWX+f AltTISlIxuSkeRe37KRe2w11Aizmukb75oPnEAAJxl60b0M82pjC7wPQFV1To3QSJ7 0E8T5AArTIOBw5tDdwm+bNeQm5gMxucQP2a7ui/iLsf6v7kNYOADPGIPHBUUgiDVU2 StuAqlveycnPsTO0BayBeuqhSDS0YoAtkVVWROzxdoWKpsJ/BL68Y/RrWHy46HmtFM 1rg5XWybaA2PJnCzPA3LS7ET6D3QugNDcQVlzvVgaPYNhqjptKWomaEHmNEBh15svD jPdlXdHQxCD9w== Date: Mon, 25 Nov 2019 10:58:43 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking , David Miller Cc: Linux Next Mailing List , Linux Kernel Mailing List , Jakub Kicinski Subject: linux-next: manual merge of the bpf-next tree with the net-next tree Message-ID: <20191125105843.2bdea309@canb.auug.org.au> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: kernel/bpf/syscall.c between commit: 84bb46cd6228 ("Revert "bpf: Emit audit messages upon successful prog load and unload"") from the net-next tree and commit: 8793e6b23b1e ("bpf: Move bpf_free_used_maps into sleepable section") from the bpf-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc kernel/bpf/syscall.c index 4ae52eb05f41,bb002f15b32a..000000000000 --- a/kernel/bpf/syscall.c