From patchwork Fri Jun 16 01:50:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 108779 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1031489vqr; Thu, 15 Jun 2023 18:54:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4+x+jOa6Cx4efbgcj79HdUSmJl7WxK08J4Y0+ZTf+d1fQj1o2gBgt+5NWdsgdp2nc70JFW X-Received: by 2002:a17:90a:928b:b0:25c:2558:e208 with SMTP id n11-20020a17090a928b00b0025c2558e208mr484928pjo.38.1686880496288; Thu, 15 Jun 2023 18:54:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686880496; cv=none; d=google.com; s=arc-20160816; b=jQyInYgUnukrzi8qVqiG14LSklbazQxRUr9vp/S0YJo1J4L0o59ae/KHAEECr1nvpw W/rUhvPNmcii4Zo5pFp5zEg1y2/eDHp9qdwNdwBTZYtwCAY4ao825I0h++k95zhJgfvK epwxc/qoWxbadAytu30pCshjMOin27lsgK5/FGMzKJ6jilupJUzcyeh3CFA2XZD1olEK j8aLQLfDmYpNUrkXQNbUWvl9u2o/otHCpQliT0niRPieupfZhYxlkmuiQ4Fy0w71j1Pi in5Mcx5XZMrh5L0/pmB4CoNi0osifiKlZtKRmmDlc5RHP1m2b8qgpSyHM0UgrImeFNUJ OQXg== 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=8SMmXRXCjVgdiSPbdgGA7WXVYWlzZj//BnOQFRTD0Ak=; b=UqoNkqLMWAx0s6SvG4pb6g/Zd0F2GK09TSdGiBp3pYP5T0Gn6ybcQNn6SwIdeOJMv7 xwI6Pugka9jSqK8CIjdZiC9VytpGfo4GSdAX8vmSsV+HzYJUZyH1M0aX+Fh0q3v/DzEp r0n7Kep+JvstxKQMozipOCCLA2pVVEx/fb9dB8SzyFf7gRWF+DDQ3zbiSppOOPrsAHBa YkXbfF2mG2KrwIj9UVj+DOgtpkizOHFNEhuF5972mB/FtADXtw7bnmT15LySGPVOy1Vn CyF+ANHr23eN4pUwCBPIFsVFA8uEcGHORR2mCaYinNDZN2hO/xapLVrETMhePhPu6/mu miqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DiUhZ0Zg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a17090a67ce00b002569b9b4397si599168pjm.47.2023.06.15.18.54.41; Thu, 15 Jun 2023 18:54:56 -0700 (PDT) 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=DiUhZ0Zg; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233539AbjFPBvK (ORCPT + 99 others); Thu, 15 Jun 2023 21:51:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230000AbjFPBvI (ORCPT ); Thu, 15 Jun 2023 21:51:08 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C49C3295E; Thu, 15 Jun 2023 18:51:03 -0700 (PDT) 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 4Qj2F20RLwz4x01; Fri, 16 Jun 2023 11:51:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686880262; bh=8SMmXRXCjVgdiSPbdgGA7WXVYWlzZj//BnOQFRTD0Ak=; h=Date:From:To:Cc:Subject:From; b=DiUhZ0Zgt/xit3thlZSAhfj+VY3awcLdHRMX3sBdPdUNIax4PYWS5/9d5oAXroofY bH9+7BaOmc+tg+LHkNSvyiKj+c/XKqc9X1pGgd6W37V0I/kx396HBlTu2iddKX1fQt j80AQq5EyrRG846FleOyEfqBiF15ZLTf1HjDpzNqR0GbKSCm1CpztoZhD7CePVKMsL xqkLd7nBNzMYWa24FpnlrmXuZzdbk14YUZe3bMD2gjHeWjA71OXWa3mgZ4wSLLAHjI GYzLrPwIdpyHDUQz2kGVMIxzUulo9YCjYa0x4ywZbTIyNekVPyAv2KyJJ3h8+AKZpG 7apijJRlXTjPA== Date: Fri, 16 Jun 2023 11:50:58 +1000 From: Stephen Rothwell To: Jens Axboe , Andrew Morton Cc: David Howells , Linux Kernel Mailing List , Linux Next Mailing List , "Vishal Moola (Oracle)" Subject: linux-next: manual merge of the block tree with the mm tree Message-ID: <20230616115058.57892241@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,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED 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?1768822403241172643?= X-GMAIL-MSGID: =?utf-8?q?1768822403241172643?= Hi all, Today's linux-next merge of the block tree got a conflict in: include/linux/mm.h between commit: 3ed01074f441 ("mm: remove is_longterm_pinnable_page() and Reimplement folio_is_longterm_pinnable()") from the mm tree and commit: c8070b787519 ("mm: Don't pin ZERO_PAGE in pin_user_pages()") from the block tree. I fixed it up (I thinkl - 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 include/linux/mm.h index e3e047735ccc,200068d98686..000000000000 --- a/include/linux/mm.h