From patchwork Tue Nov 19 00:43:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1197059 X-Patchwork-Delegate: bpf@iogearbox.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="Astlrpt6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47H6Ww4LcNz9sPT for ; Tue, 19 Nov 2019 11:43:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727053AbfKSAnn (ORCPT ); Mon, 18 Nov 2019 19:43:43 -0500 Received: from ozlabs.org ([203.11.71.1]:58343 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726809AbfKSAnn (ORCPT ); Mon, 18 Nov 2019 19:43:43 -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 47H6Wc0jffz9sPT; Tue, 19 Nov 2019 11:43:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1574124220; bh=xMxw573KD5jDq42n3/8r5oPhgnATMUQil1KgKEsaq6k=; h=Date:From:To:Cc:Subject:From; b=Astlrpt6b8XGpP7RNqEGM0Z5G2fdpwvY4t3Mz1z8TYVrTGepZcB8are8BrslzOOOD Vla9pNoaA8YURXDbSvaSSzeTcYhtLtkWjqYqmR1T1bNKwZeeq5vgIHnnPTgbsBJ8ei nnBvyvBCvUghTfEYxiX1GX7xgFisxJo0JQLpollXxSRKiex8LdGlOAKJkFBmyXRLlG BlDM4BB0ZOS/Rnh8G2mvGePQ6WauAouMsmZkGIx5bg6G36doAEk+DSi/ZNwDfKm1g2 q1pj/NwWBl+zEFiRZS+PSyYdQ39ApNEsIeDbvphU2i1TtvWdJAxMBhY1rPmMibjfNI IdKFLcATuJAsg== Date: Tue, 19 Nov 2019 11:43:33 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking Cc: Linux Next Mailing List , Linux Kernel Mailing List , =?utf-8?q?Bj=C3=B6rn_T?= =?utf-8?b?w7ZwZWw=?= , Andrii Nakryiko Subject: linux-next: manual merge of the bpf-next tree with Linus' tree Message-ID: <20191119114333.757f8429@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 conflicts in: include/linux/bpf.h kernel/bpf/syscall.c between commit: ff1c08e1f74b ("bpf: Change size to u64 for bpf_map_{area_alloc, charge_init}()") from Linus' tree and commit: fc9702273e2e ("bpf: Add mmap() support for BPF_MAP_TYPE_ARRAY") 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 include/linux/bpf.h index 464f3f7e0b7a,e913dd5946ae..000000000000 --- a/include/linux/bpf.h diff --cc kernel/bpf/syscall.c index d447b5e343bf,bac3becf9f90..000000000000 --- a/kernel/bpf/syscall.c