From patchwork Thu Nov 10 06:55:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 17986 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp765564wru; Wed, 9 Nov 2022 22:57:59 -0800 (PST) X-Google-Smtp-Source: AMsMyM4f1DNbgbI2SqgL+/Q/Pr47DcJ4aCyb7xyOoEcp/GsFU/OWHq8Y8QCTmg4AfRkk16p2BwKC X-Received: by 2002:a17:902:b598:b0:184:e49d:3042 with SMTP id a24-20020a170902b59800b00184e49d3042mr64172135pls.16.1668063478547; Wed, 09 Nov 2022 22:57:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668063478; cv=none; d=google.com; s=arc-20160816; b=OmbLcTry8WVZhFpD8cps+IHwbMpNixBiY44uHkI8l4cVvV0MN3bDi0el00R/wZSoS3 lsoqWK6RqPcz9og7lZdbrr4dMZ2sY5uEUw9265Pe0gZNRekbKVpuUE5qgvyUirVkYj3b StLep+Nq2YPKaBRGF5st+mK6xqsS4lgMnAVpaaHqoyUxxbvweTKPFgrIHvY/mLZO07mo xNu4gtXM2wPKIROin8E63WU3vEJ119Kyxf7xKaVFjVBj3tK7V3HX7RRT4OBQ/+cAzFyz UOSh0RMXXen8FzwSABVb65xKg7VSLWM0l7UqYfrToBSSMmM9q7GntENH+4zUI8iQYXxL BZuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=TiZs+SEY1PgsVCWcuX9sf03rYQ9hc0zKFA0Q8uNqsXQ=; b=CXwP6ogOHxYQiMR9JJpsauJSrVMZHkgQs20Ej+ezgMC9bnD1HS2q/3Yb+6gtlxRifD FBYXxyOkdMY4Y3eQhR6TrjyAvoWLrgvvH9/39WZl8NVwiFgJJbrP94+2tcrWfZTmLQV3 yZ/TRX1EhRcbxrVHxD5zG2FLl2kyBLvdfRzfHGyaEfqkwrbBwx4pngqM3dI7tJ2zDioc NGwldB4N6r3mXJkNbB90jjZFNKRBHx+Wx7rq5M8L5hBapWqN7hJ65u530V9SbZ9hyIee Dwa++yd6B7fV8FhZiPjDaFLtxVJwRbgC4Wy0e/iYgp7Gja0yboCZx8gFkVs4ET4DPcVr J3uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=M7MtsNyo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h20-20020a056a001a5400b0056bc9b188c6si20300685pfv.245.2022.11.09.22.57.43; Wed, 09 Nov 2022 22:57:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=M7MtsNyo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232680AbiKJG4H (ORCPT + 99 others); Thu, 10 Nov 2022 01:56:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232714AbiKJG4A (ORCPT ); Thu, 10 Nov 2022 01:56:00 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C0CD31EF9; Wed, 9 Nov 2022 22:55:55 -0800 (PST) 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 4N7CKP4MH3z4xYY; Thu, 10 Nov 2022 17:55:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668063354; bh=TiZs+SEY1PgsVCWcuX9sf03rYQ9hc0zKFA0Q8uNqsXQ=; h=Date:From:To:Cc:Subject:From; b=M7MtsNyoelh+ptrpbponh/mYrNdgkqI2XNOSb9PPVucxUnvVLQ3kbvrEuRPxMERq/ 6S7UJs27yMB+FEVGm13oaLdTaEeNSbu+YFSiKgsBvOQcwGHc2j9rZes0otnsbj6A7J +xsiIKCgCIWo2w7OFdfV8YDcK+5BSdCf8GXJ+T7ABh8hfV/U+78VwTELtbfwAeKFqZ B8nSK+wIP8+jrnX1pTlGUw3IpDR0fbRw5ShR+iZntohFVdaLXFf5ECvwrOO4Wy36co hj1ht4R4ancodGYUVs6ohccX19nRyK8IGg0lZkLjEU3nIpGLYnWwQYUxpps8evjhMi YWULYmLVVyINw== Date: Thu, 10 Nov 2022 17:55:52 +1100 From: Stephen Rothwell To: Andrew Morton , Jens Axboe Cc: Dan Williams , Linux Kernel Mailing List , Linux Next Mailing List , Logan Gunthorpe Subject: linux-next: manual merge of the mm tree with the block tree Message-ID: <20221110175552.20587f28@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749091329961863214?= X-GMAIL-MSGID: =?utf-8?q?1749091329961863214?= Hi all, Today's linux-next merge of the mm tree got conflicts in: mm/gup.c mm/huge_memory.c between commits: 0f0892356fa1 ("mm: allow multiple error returns in try_grab_page()") 4003f107fa2e ("mm: introduce FOLL_PCI_P2PDMA to gate getting PCI P2PDMA pages") from the block tree and commit: 7928e6cb4ec6 ("mm/gup: drop DAX pgmap accounting") 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. diff --cc mm/gup.c index 8a4b1a783cb6,5182abaaecde..000000000000 --- a/mm/gup.c diff --cc mm/huge_memory.c index a075e3803e5e,ed12cd3acbfd..000000000000 --- a/mm/huge_memory.c