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=-5.8 required=3.0 tests=BAYES_00,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 336DCC47082 for ; Wed, 9 Jun 2021 00:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1ED856136D for ; Wed, 9 Jun 2021 00:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235097AbhFIA2J (ORCPT ); Tue, 8 Jun 2021 20:28:09 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:46613 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234990AbhFIA2F (ORCPT ); Tue, 8 Jun 2021 20:28:05 -0400 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 4G07FG1nZcz9sW7; Wed, 9 Jun 2021 10:26:10 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1623198371; bh=pl3AOWhvROigPTYFQ/g6KGGpHM5/xYck96wanPzXANM=; h=Date:From:To:Cc:Subject:From; b=qFBV7k6B4P1S5QOQP7XDiVfjhAvZ11Q04YpAmY9m3AepPQwqr+pja+YarkuXO0aXp 55yneG3h5ubLBKzsv4fjkw67YSJy+joH1G5QieTUDvTi1nYPoDgOAguifQJyTJ04Hk og5PxZ8hQbH2t/peaRZiqWtwsmCIhU2HAdRXZZ8Qn1LzICW5zLBcguXdMYdwmLp/CP tP0g17K/c9HI3MOh+c/9be4AoQLolCYkAsEV44I39Ct1dRlhHSq4DQgGtYjmwc8TzE qyKsVj7jzkjdjN3Nwyh3UJwfofXwhsGEnBp6m6EIJCqgthYe++jRLCTMrdC3FcodYw h7T8iNF4lAmHQ== Date: Wed, 9 Jun 2021 10:26:08 +1000 From: Stephen Rothwell To: Palmer Dabbelt , Paul Walmsley Cc: Jisheng Zhang , Linux Kernel Mailing List , Linux Next Mailing List , Palmer Dabbelt , Vitaly Wool Subject: linux-next: manual merge of the risc-v tree with the risc-v-fixes tree Message-ID: <20210609102608.5582071b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/98tfuBKAYllB/MvOUzwnlvO"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/98tfuBKAYllB/MvOUzwnlvO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the risc-v tree got a conflict in: arch/riscv/mm/init.c between commit: 8700a6b6fee2 ("riscv: fix typo in init.c") from the risc-v-fixes tree and commit: 010623568222 ("riscv: mm: init: Consolidate vars, functions") from the risc-v tree. Note that 8700a6b6fee2 supposedly fixes 010623568222, but 010623568222 is not an ancestor of 8700a6b6fee2. I fixed it up (I just used the version from 8700a6b6fee2) 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_/98tfuBKAYllB/MvOUzwnlvO Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmDACqAACgkQAVBC80lX 0GwN1Af+OFsLhLCug6E2yjqN93UeaoQjN+GorRWE4ROdOkXqPoZBIgc2etpU+Yto k+y4QdkCTcBi6VRXOBR1cKs/wiIsvewEpBpweqyBeH+0guogSCcE+sR71XTwHCw0 pOLFRszkYo5MTT/ReiTqKFIyQ2D7Fj0TkLg4hiL8QdJGdGKWGTmLY9Pa7RpwnKYv 4RGm77Lf4hXg0qmYaWOAN7+iG15sEVkIpJeGu89wJg5onqbhEST0RGadpleCFIEN nACirCY6+y5HsTAfot/2xdhZNs5kNjW2kcnYaDPF88t4vhzCcgScpwe+dTL1Cq1p j4uMI7VRNgKSeIqifIZLAdokLyt/fg== =vt0t -----END PGP SIGNATURE----- --Sig_/98tfuBKAYllB/MvOUzwnlvO--