From patchwork Fri Jun 16 00:25:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 108777 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1021974vqr; Thu, 15 Jun 2023 18:25:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6d4NXpdRWGhc1on2E0d84OWfAka6UAiXXtomSlNdHIzu9GrRRYN3f0F6l8hswU+UrEQcf4 X-Received: by 2002:a05:6a20:430c:b0:11d:2b0c:7f32 with SMTP id h12-20020a056a20430c00b0011d2b0c7f32mr1408218pzk.13.1686878725952; Thu, 15 Jun 2023 18:25:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686878725; cv=none; d=google.com; s=arc-20160816; b=NliMC0JWi/Qf7kr+GY49hPbkR6epMOhmNQs+eH318yynUR6agobX4PnlPIWxsaBToq fdoDxMxugVXoByWRKl0XvC9jSxr098NPgYGbhTqGrYIh5HhwRwmzyLr5rB5UrEJVbCeg Tz90w8GO1Aq08NjShRHBi18M7sQXZk8oKdDxi+y51Z/iMp4dHkjukrs10NAUuA1ziOMI ICzZ66wYMQhlq7Q8s3SjYY4Mjw8lpWvxEtU0b+gatSIuF8q3ExfbOEXPgLIAZ13ZNfdr 46OZLvQlNX9bap6M1gUIs6+ZJfv7ou0twDh/TYzmumKga+TphqW1kin5rJtM0A2ZDjzh j5Mg== 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=+/o2wJdvhNn8owmtxm/tIRC6tn+RcQNcjmwiB22+zVg=; b=d4lZdTnd4j8FexV7dOD7ffU0zEcwFBS5PxFRUwg0hU7Y2nY1qZ01GJ5UItotLy3Dv7 7bDpj1Zd5xxZFjRO7qiRFzotLy2ji5hvTI9sFc47FhRcd0eZWEqxKTjA0nu3l45EW0s6 1uCWzqhtb2Gb+RJxbpzYTBKo14cnI+qyAnoy5eqyPTnFoU3sMEeqLSkFnaioZzkvxjtH nYbCNdciCNxJbJ8YCdjZbqIgUqXqEQAZ84TtDtf2mh/fWgPcOp73y1xAcfbuSKOvoxGD /EzmekG/7AR0T+Q6Xy/EGlQTgwyP/6jGyUvXs+q5YF2VwRi4T2+qbGAN9oicGFlkNmxd Nidg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m1jw6Z0h; 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 b5-20020a621b05000000b005a8c65d57a0si11465422pfb.257.2023.06.15.18.25.13; Thu, 15 Jun 2023 18:25:25 -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=m1jw6Z0h; 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 S229666AbjFPAZf (ORCPT + 99 others); Thu, 15 Jun 2023 20:25:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229453AbjFPAZd (ORCPT ); Thu, 15 Jun 2023 20:25:33 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AD56294A; Thu, 15 Jun 2023 17:25:32 -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 4Qj0LF5ThSz4wgm; Fri, 16 Jun 2023 10:25:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686875126; bh=+/o2wJdvhNn8owmtxm/tIRC6tn+RcQNcjmwiB22+zVg=; h=Date:From:To:Cc:Subject:From; b=m1jw6Z0h3IRyqMc4AM9INTrWVvilJbZK4KTxwahHwOULPV5tax6BHXYxwKu78J8Se Hwr3/DE2MYMHWgNdb1SR6Q5Hp9ZRlMHEpCCWHsOWYqKJOkWmybh/0Y/CzQ4V2qrR4X 1NJQ0xHphPCZzvtxPL3iAva0zXFKQludkO1QaXAr4reKAWpbP++zIfdcHnWIBVuKGs yX0ufvFCNCMZ7Aid6ReCaRB8XsLbOaxbS8nxQdgyOnrsYPrretS9bB13u3rkNlatf1 9ZphMKn5k+sAK4UcgTMcIbOivCNizgWNFsJs4MqakOljHTwl32lIWoIdV2TxjXsO9Z 34lXwig7Qb7pg== Date: Fri, 16 Jun 2023 10:25:24 +1000 From: Stephen Rothwell To: Jaegeuk Kim , Andrew Morton Cc: Christoph Hellwig , Linux Kernel Mailing List , Linux Next Mailing List , Lu Hongfei , Yangtao Li Subject: linux-next: manual merge of the f2fs tree with the mm tree Message-ID: <20230616102524.73bb5efb@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, 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?1768820546980458702?= X-GMAIL-MSGID: =?utf-8?q?1768820546980458702?= Hi all, Today's linux-next merge of the f2fs tree got a conflict in: fs/f2fs/file.c between commit: 0d625446d0a4 ("backing_dev: remove current->backing_dev_info") from the mm tree and commit: d61812691182 ("f2fs: enable nowait async buffered writes") from the f2fs 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. diff --cc fs/f2fs/file.c index 7134fe8bd008,41e7c2b80f31..000000000000 --- a/fs/f2fs/file.c