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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 C3A93C2D0C1 for ; Thu, 19 Dec 2019 23:24:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98D8924676 for ; Thu, 19 Dec 2019 23:24:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="i4QWQ8qg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726998AbfLSXYD (ORCPT ); Thu, 19 Dec 2019 18:24:03 -0500 Received: from ozlabs.org ([203.11.71.1]:56215 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726880AbfLSXYD (ORCPT ); Thu, 19 Dec 2019 18:24:03 -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 47f7HN3nqBz9sPL; Fri, 20 Dec 2019 10:24:00 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1576797841; bh=L3pydL2Ngv3G7U0NNXz1d30ilpikZOS17+/Vd+VSnpc=; h=Date:From:To:Cc:Subject:From; b=i4QWQ8qgnEEP/T5LXRMzEq1e7MuUgZPSrPKMKz90RrM2LOY2BMvGaCvV+PP/0Rkaa rSyC4XSbpbzLibyDVDxpB1Mb1+aK1v7F8hJZXGDWf8WWoe6HO8l3btTPY9ip2ooLwv Uu9dB61n+ZQ1GgC3q3ydjWUQsJiU50tRNz6nxolCifKfUp7v2JlhEb24ILZZa8Lvic 4QAG3xxPZq4i8953R+GmxMxilDkdierCUZ+scRVznND6y0zAr6fONMo4jFpfWBlEX/ WpA0hBK8MAjnYymlQLyElQTdSc2mJqYxtSCZZufYOo347GhMO3tavMiayoQ3y9SAyw Nt8bwf8HaZUPg== Date: Fri, 20 Dec 2019 10:23:54 +1100 From: Stephen Rothwell To: Daniel Borkmann , Alexei Starovoitov , Networking , David Miller Cc: Linux Next Mailing List , Linux Kernel Mailing List , Paul Chaignon , =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= Subject: linux-next: manual merge of the bpf-next tree with the net tree Message-ID: <20191220102354.1b1cb3fd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/_z6.GrJ=MVBvH_br755K9vj"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org --Sig_/_z6.GrJ=MVBvH_br755K9vj Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the bpf-next tree got a conflict in: arch/riscv/net/bpf_jit_comp.c between commit: 96bc4432f5ad ("bpf, riscv: Limit to 33 tail calls") from the net tree and commit: 29d92edd9ee8 ("riscv, bpf: Add support for far branching when emitting ta= il call") from the bpf-next tree. I fixed it up (I just used the bpf-next tree version) 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. --=20 Cheers, Stephen Rothwell --Sig_/_z6.GrJ=MVBvH_br755K9vj Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl38BooACgkQAVBC80lX 0GxWzggAmAYGyGJ6MoKba2FdA3OJ1OawhcaCQZ+3X8LuuPIuMYL7zyYkOQ0e1dge 796us+S/9p+/aHGtwQ3xtOS2/Rrwo2OiEHnv3aVjdwoNRcCIrYwQDDaYidrCcDFE nunUe7FepTP9OHGfoO87awgQfzn25eIULuRrdhbyI8Hrod0D46zf2F1Gx0yUmoZI gtUHW8aiUI+PzZXJAA2ScXGI8Ed2Jk9X5OtZRFP+tGQRsi1z0DUWAKgGU4LUSS/S J7iDO1/21SlS5JPITGFsStx9TCRpxoHQXYlwg3oslIJUgdMyib7kkOElPDBrK6Kh N5gSEA5kxD8t6W7zqLePEPSWLO39ig== =U515 -----END PGP SIGNATURE----- --Sig_/_z6.GrJ=MVBvH_br755K9vj--