From patchwork Fri Jun 16 01:58:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 108784 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1042721vqr; Thu, 15 Jun 2023 19:25:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6PqTZ9awXZD+O8IdbKbQQGb1EBhUsxkHPFhHgBIvk6dg7bQCYSFobfir9Vw7AAgPyeX5Q7 X-Received: by 2002:a05:6a21:6709:b0:10c:6:61d1 with SMTP id wh9-20020a056a21670900b0010c000661d1mr937057pzb.39.1686882332771; Thu, 15 Jun 2023 19:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686882332; cv=none; d=google.com; s=arc-20160816; b=CkzHPyK8gKLAoJX06sQsUxuOKPmSOP62LnUeTTc6nbnAe+b5b0mhY9yEaVZeHnH5Q6 NN/RUtRdhkj0qDsCEa9FV5ngQjTgSjpLLH/Wqe/WcaeJBelWRwNmLbvAXQJErhGFrAO8 ecaEczO6ePLBr6EhwGioafGfxnpp/Lj///Sqgw0uDGaD7V1Q0V4jSjMw1Fzy5cm/pPMy ePPiNOXbT1P+U4Oetg/kFzstCSfuThL6cKBtqb07vw5qcD4JNx8EdPuo3VQ5KQefgRQb bmF+dy4sZFnkvL9TeVU+UK0blEL1uuLSsYjkkO4ARvrNa744e8my/xbS0InaXTs86AVC jBrA== 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=nGXAVqcuQCj/AhaQov4ey6oWhNQZQLuD88nrYkvIJ/c=; b=y/T8FfRZPqf4uqGg1LFbRFcyBOVNiZBq/3Tf5/dryyWuDodtA6TF4HGiuoBiDiBgck WokPF9lnR2jrihLlgvTOTwGfDAkpDCDGHzMhVk9EYtGk7ZmQ4PeI9pIbsGyRoWB45H5I I4EQEIiRNrenVKY7PP7gJFSkRpJB9YyZTp2Rldsnj9JlKrVelqG+MhzE+dJSWcMujwJJ nVmYyji5B3Ef9ahguee4vY7vuLmQA+ravhTi5sIAFT6WjcbM0Ww60DdzbMlD+ZEoND4M 8L8fyAH2MSc9pSYGkXO/UxxZe2CCWFOyxsHcOkDf+fcGzlxHnbGsGilOzt6TMULw67Bk 8bYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="XFSst6v/"; 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 c15-20020a170903234f00b001ab09a66f8dsi14288439plh.106.2023.06.15.19.25.15; Thu, 15 Jun 2023 19:25:32 -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="XFSst6v/"; 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 S239294AbjFPB7D (ORCPT + 99 others); Thu, 15 Jun 2023 21:59:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239295AbjFPB7C (ORCPT ); Thu, 15 Jun 2023 21:59:02 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB5B61FE8; Thu, 15 Jun 2023 18:58:59 -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 4Qj2QB3STfz4wgH; Fri, 16 Jun 2023 11:58:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686880738; bh=nGXAVqcuQCj/AhaQov4ey6oWhNQZQLuD88nrYkvIJ/c=; h=Date:From:To:Cc:Subject:From; b=XFSst6v/PjotB/RVnhUNyBjIoQzHaYilq/R/vX3CU5AhXh3wEi+cn0AgoK3fvwPqa p7WMocOwL7acb4qALjpDzSOQX2gCTq3YxJ4DMQvJzAk62AZQfHLu1fZ6PK0Ln2QdqL mF0+9lKugZIoDSEBb9AcFv3lu6D1meSjussvDqoM4IHVSLWV9rMI2wSeMm8HvmzRqr bqjzIzAlmSsxWnd62kAcZIZszRYLmmDXkqjHZNB4wMZj4NiIRdqBurj1wxxmmCLMgp zoFfvPv2OIbQjJGnUtmYP+Iqmue4GYnH84u13+HvAEhiM++bqTQr4P1NiNeFe1XeC4 tPSMpW6SdLtMg== Date: Fri, 16 Jun 2023 11:58:56 +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: <20230616115856.3ce7682c@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?1768824328889638600?= Hi all, Today's linux-next merge of the block tree got a conflict in: mm/gup.c between commit: 0f3f569eca46 ("mm/gup.c: reorganize try_get_folio()") 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 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 ce14d4d28503,0814576b7366..000000000000 --- a/mm/gup.c