From patchwork Thu Apr 13 14:55:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 83017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1101889vqo; Thu, 13 Apr 2023 08:03:48 -0700 (PDT) X-Google-Smtp-Source: AKy350YhSXAV5blwp5jEdcKadKn7/GoGgbeeBaoo+a4b9RVEhCZn2PFaA3BAUPDY5P0SRUKX0dOE X-Received: by 2002:a67:b608:0:b0:42c:3ae2:d97c with SMTP id d8-20020a67b608000000b0042c3ae2d97cmr878091vsm.34.1681398228571; Thu, 13 Apr 2023 08:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681398228; cv=none; d=google.com; s=arc-20160816; b=S/JK4ChxSSUN3UEzTNGuHwiP6lbIesfHXs3YyxNIhFzVulWrjYt7Ii7iTpDUo7qiSU J7ikvsMYLgiAB4llkPxzxjWKgq2X5GIhOp9nocKXcxMcJ+RThtz9Cn/lMqAJ/cih4vU0 sHrRlFYPX+9UrYmmTaRgb3EW8HQj/xMOpkHYvUh00rxiiD6MKgAr5DkzEUIRBO1+I1f9 GSeuHUN9NaUVUFt3VhyfYwnUFJ52YImlMSnTLQqSwucNKwOkFDwGQYOow3NqUaScgvzw CkX7FqfYGtUkclSBrdbBIydJ8BTXJrC370nSxEUhPDEf2YhPTaxJCqxWGkL8p1EYAoks UnGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=PET6ho00TE8OTO/ZkIcrRcvJ296WtSzc8DAMJ25og84=; b=VcdQjDrpzmb/uI2NLWwgZx1DF4MtW1rPEircvmta0UZmquPkeYZb5YHiJcYyInkZDb cmvX0bSaPBdS5x9O1iEtnKQZccSg23JdELTDgOOtoPDo//Z8ZgjE77d1xredp6Yjauco IYJyCghH6Sfw4FlkJXapQcZC18TbU2nOUI8dxi/Z/sxmiLjXVhBCbGi7In8Hl2WWP6xQ 53Gu1UiDh5Bgv27N2vxB+OLjDJ/1oXYvT1CJgW0XNSHFSQRNeZ2ZzJS1feNioj2TeK3E ULUPpoS4Yh9z2K0CJdbQZNqOab4B7oOlBUUZAQ7l/DsAx+OSKIZMvF2k9aESbhdn7+4n QFyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UFqDoVfd; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x18-20020a0561020c1200b0042c9110ef35si476474vss.24.2023.04.13.08.03.28; Thu, 13 Apr 2023 08:03:48 -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=@kernel.org header.s=k20201202 header.b=UFqDoVfd; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231319AbjDMOzZ (ORCPT + 99 others); Thu, 13 Apr 2023 10:55:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231163AbjDMOzV (ORCPT ); Thu, 13 Apr 2023 10:55:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7998FAF1F; Thu, 13 Apr 2023 07:55:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C5C7363F4F; Thu, 13 Apr 2023 14:55:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCBB8C433D2; Thu, 13 Apr 2023 14:55:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681397719; bh=1ngw3+ChjRIyUddHJBteRhw3PmiASGHZag3zYF96owI=; h=From:To:Cc:Subject:Date:From; b=UFqDoVfdESH/IQXu4viD92MUCOsOxzznISfvQIgZ3Fo7wTd2AjamKlHfKy1fOpbXz sCzyg5+Re/yQNHfBs4yEPowoUw6FiH6VOO9Qqd5/nfDwO7x2eUZvil+5yWv2m01fs2 k/CUxTOZ65gXkbytVch58Rfj3umHeyCUWOK0O+CIX4CIawFMDV3qzhqccv+F7wycE5 C3agESBfj77BSdY04AgRkLqQIVgb6JCoI4jTmSN4mV3rXNnvzccq3LU9G9kc640Rl3 K2OcFGH+i/GXdXItSwALtM98R5D49Fdr1yMcoHg9qF4xig4jqrlg+f5Bce7IDbTBlR Thl/SXENdxmxw== From: broonie@kernel.org To: Theodore Ts'o Cc: Andrew Morton , Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Wilcox Subject: linux-next: manual merge of the ext4 tree with the mm-stable tree Date: Thu, 13 Apr 2023 15:55:15 +0100 Message-Id: <20230413145515.3534108-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,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?1763073828988383466?= X-GMAIL-MSGID: =?utf-8?q?1763073828988383466?= Hi all, Today's linux-next merge of the ext4 tree got a conflict in: fs/iomap/buffered-io.c between commit: 66dabbb65d673 ("mm: return an ERR_PTR from __filemap_get_folio") from the mm-stable tree and commit: e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN") from the ext4 tree. I fixed it up (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. +++ b/fs/iomap/buffered-io.c @@@ -467,7 -467,8 +467,7 @@@ EXPORT_SYMBOL_GPL(iomap_is_partially_up */ struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos) { - unsigned fgp = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE | FGP_NOFS; + unsigned fgp = FGP_WRITEBEGIN | FGP_NOFS; - struct folio *folio; if (iter->flags & IOMAP_NOWAIT) fgp |= FGP_NOWAIT; diff --cc fs/iomap/buffered-io.c index 96bb56c203f49,10a2035155835..0000000000000 --- a/fs/iomap/buffered-io.c