From patchwork Thu Nov 10 06:22:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 17961 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp756369wru; Wed, 9 Nov 2022 22:29:11 -0800 (PST) X-Google-Smtp-Source: AMsMyM76aLbaVqrpDPbW0g0+FHf2dVqmt7oWYU2qWc8SjeMJgld4X9Jl5wPGzY0GQCKSWIumtNtI X-Received: by 2002:a17:906:3b88:b0:78d:c7fd:f755 with SMTP id u8-20020a1709063b8800b0078dc7fdf755mr2444028ejf.702.1668061750941; Wed, 09 Nov 2022 22:29:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668061750; cv=none; d=google.com; s=arc-20160816; b=pQGjVGKUCnf/AIBW4/i98mvINlXGZbR/piLQuVAqzlCFksb6S3Y9HLVZiHEcK0AVsh 2xgeA/NUr7sz5ibfaB+Y48S29i/cfqe+XnyzQ1222YY9DoLVUVNjOphDPheJOFwzzq/M 1u1P5ngn9YOvbPltdkQ3OhWyhqPYsc6Qe8eki/RzGmQ8ymGr2KZJeyn98T4l3oGaldj9 eNUHC29I2fv6SSiGSPXtIgCZL5QAdsy7i5TUgYkdeQR4n7jzL7QInBXGtm8a5p8IWNHP PUDkWpJr6QMmIEFYLimIdENo1KL3sS9Yq1X+HUyIA9XRzQCFelJJw8ub0M3EiZQHEFpM l55g== 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=gmweExB1iS+T+b9aVwFAzpsdiF1p2TuESW4E973DwR0=; b=faZpfZdAMfmkmLnt+H99Cv+D8Pi/PPkcFVw2mEtPzv9aGdc2vkYYRveL/0Xfpy2Jb1 tLnmmx8kkmO3DjoiZW14UZIksaRXIAmHo/SnCw5IgaSaAvUNPq7eQ8SRjOTuxt1xNAax RNzRlyEU2Dcm/vojEBKbGSKawz+Z/UczIChcBPytbAk7oDmmP1y04Xmafxki1rEZFH3x MP/HmQd/dRaFvn9QQEMqVPyxUTf/6AA1ax05vuYzaw8mDmquNO9IykoDZ0JSxG4mAAAg 7h+p6a08v1wQDYjHEUKjHzGJcDShOsa42WSFdDR5L0zriL2UsOx2YJ7k3S/VNwHjtaro NsLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="n/0tSIZC"; 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 ga27-20020a1709070c1b00b0073db353cb25si18487590ejc.869.2022.11.09.22.28.23; Wed, 09 Nov 2022 22:29:10 -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="n/0tSIZC"; 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 S232259AbiKJGXN (ORCPT + 99 others); Thu, 10 Nov 2022 01:23:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232444AbiKJGW7 (ORCPT ); Thu, 10 Nov 2022 01:22:59 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D5512EF4E; Wed, 9 Nov 2022 22:22: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 4N7BbD3G1Kz4xZ0; Thu, 10 Nov 2022 17:22:48 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668061370; bh=gmweExB1iS+T+b9aVwFAzpsdiF1p2TuESW4E973DwR0=; h=Date:From:To:Cc:Subject:From; b=n/0tSIZC5kw/ZKiqdnIz1roP5UoKo19hUAf7a61uarMSCcBiT4bVxjiZDVkNqF/hA 184LEbjUgSlvKpH6K0nNnTvopqqbd3ayoPzg9SK1BiYef0nQZ4BrZeK83japFMHXww OnhyqBw27jGmqJtoVgwfx/2mdFOZ5OjDo98cOSio2NbA7+imd8uP4pgOk2yzUyqVYO BAFczmyjz25V8izLcEzY4D8plmsVomlyeu9zwuRAZb9i5jU7EGOwFZBOqmtf8IFpSr xzUMRfcG2mttp5AxrphKD8KbS7OAuQ2JyxBOXb4PIv27dkPK6Fo0Qr033Qk098bE+/ nnhymQVExneuA== Date: Thu, 10 Nov 2022 17:22:46 +1100 From: Stephen Rothwell To: Andrew Morton , Jens Axboe Cc: Linux Kernel Mailing List , Linux Next Mailing List , Logan Gunthorpe , Mike Kravetz Subject: linux-next: manual merge of the mm-stable tree with the block tree Message-ID: <20221110172246.32792d6a@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,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?1749089518563323067?= X-GMAIL-MSGID: =?utf-8?q?1749089518563323067?= Hi all, Today's linux-next merge of the mm-stable tree got a conflict in: mm/hugetlb.c between commit: 0f0892356fa1 ("mm: allow multiple error returns in try_grab_page()") from the block tree and commit: 57a196a58421 ("hugetlb: simplify hugetlb handling in follow_page_mask") from the mm-stable 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/hugetlb.c index 3373d24e4a97,fdb36afea2b2..000000000000 --- a/mm/hugetlb.c