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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54014ECAAA1 for ; Tue, 6 Sep 2022 09:29:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239180AbiIFJ3d (ORCPT ); Tue, 6 Sep 2022 05:29:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239292AbiIFJ30 (ORCPT ); Tue, 6 Sep 2022 05:29:26 -0400 X-Greylist: delayed 439 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 06 Sep 2022 02:29:22 PDT Received: from mx1.emlix.com (mx1.emlix.com [136.243.223.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8CBD21E; Tue, 6 Sep 2022 02:29:22 -0700 (PDT) Received: from mailer.emlix.com (unknown [81.20.119.6]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 1B01E5FB05; Tue, 6 Sep 2022 11:22:02 +0200 (CEST) From: Rolf Eike Beer To: Andrew Morton , Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List , Steven Price Subject: Re: linux-next: manual merge of the mm tree with Linus' tree Date: Tue, 06 Sep 2022 11:21:56 +0200 Message-ID: <1697463.OzeqPvCt3f@mobilepool36.emlix.com> In-Reply-To: <20220906190141.028ea19a@canb.auug.org.au> References: <20220906190141.028ea19a@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart17688512.O1j82dVNQg"; micalg="pgp-sha256"; protocol="application/pgp-signature" Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --nextPart17688512.O1j82dVNQg Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii"; protected-headers="v1" From: Rolf Eike Beer Subject: Re: linux-next: manual merge of the mm tree with Linus' tree Date: Tue, 06 Sep 2022 11:21:56 +0200 Message-ID: <1697463.OzeqPvCt3f@mobilepool36.emlix.com> In-Reply-To: <20220906190141.028ea19a@canb.auug.org.au> References: <20220906190141.028ea19a@canb.auug.org.au> MIME-Version: 1.0 Am Dienstag, 6. September 2022, 11:01:41 CEST schrieb Stephen Rothwell: > Hi all, > > Today's linux-next merge of the mm tree got a conflict in: > > mm/pagewalk.c > > between commit: > > 8782fb61cc84 ("mm: pagewalk: Fix race between unmap and page walker") > > from Linus' tree and commits: > > fa02fb928200 ("mm: pagewalk: make error checks more obvious") > 66c217081bd0 ("mm: pagewalk: allow walk_page_range_novma() without mm") > > from the mm tree. > > I fixed it up (I think - 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. Andrew, please drop all my patches except the following 2 from your queue for now: -mm: pagewalk: fix documentation of PTE hole handling -mm: pagewalk: add api documentation for walk_page_range_novma() Some of these patches are clearly outdated now with 8782fb61cc848364e1e1599d76d3c9dd58a1cc06 being included. I'll review them in detail eventually and resubmit what is still relevant. Regards, Eike --nextPart17688512.O1j82dVNQg Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iLMEAAEIAB0WIQQ/Uctzh31xzAxFCLur5FH7Xu2t/AUCYxcRNAAKCRCr5FH7Xu2t /IRdA/wOKgkuuUhb8NObay0gGGsA6yE3ewYcmMO3g0KJ2GYonYuqtMvUQetW5KiK hxsfkPAn6MdEf2Bxo97798KH9xXi0hL16d04Sxbh2LQAERJvU96Lgnm/AD5X35QD ZtE4S6MlVXTTiaZqDRD7M8ABNmJvqf72js+G1f7UNy/bBH5V2w== =5lQP -----END PGP SIGNATURE----- --nextPart17688512.O1j82dVNQg--