From patchwork Sun Nov 27 22:13:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 26425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5320315wrr; Sun, 27 Nov 2022 14:48:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5ea9tRkJ1xdBgfNINfaA4A3nJjMEJlDFAF9RcgYmqUT4zMvU4+tfmVxK/oTqES8TxKvf4u X-Received: by 2002:a17:906:a884:b0:7bd:15a6:27e8 with SMTP id ha4-20020a170906a88400b007bd15a627e8mr10216682ejb.78.1669589284717; Sun, 27 Nov 2022 14:48:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669589284; cv=none; d=google.com; s=arc-20160816; b=rq9zX1/ciQ8ObzBArdCodsn57qLSVb5wJKWQ2xGTOawb78HgoQeqhmZfS5Wx2gB+NU +ARJrfVsdYTEYThxha4ylRRCKkQJCQPh5IZ87k+bTaZKQPOgHWcc2+vA5c1KchMBsZq3 ZpKzwUdAaaJHExcebfArH/iu1EEeMOBi8/J7rqTk4RLpNroyQij0ON+cPWragOK22DHS +VjMyUaxFqFxxXdmBclhhgjv2h2xPb5Q7pb84W3A3RnbhisqznRcxaPbHzho9blmQeR8 0cJesxrk2uM2HCiMG9BBD3Nhg8VQdSu5t85+tTCOBne2FDaq3fT5BZooPq8XOr3bLkkT cldg== 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=OA8cwrc4AeSC9IBQ9abRGC2/KKssQi4afT8E9LGyKVk=; b=xTgR0u+rv9/BWhgVozGbP6dIXxO56ezV1o0xtpAvXc55GFTKkhwyCPRMDHoV1R5bZ9 Wk8nMkqR3Yydw+qkGB0HyztiRBf2hXhEFcUqg9MzDCaZzfYfRsYXt/4CFyNgezCgFvv0 yPSeQHusc+NGiDaxBveZvP2/ZDIUtBhE8c7YtLvSGpVfjF1IGhhsDBI0W4EghAMZCOW5 ID2Vg/Azu809TVZm5UhpLCitC9Fvg8FvjdjNn7w/WmdJLjH41BbQoQ2+uMtVEkhBlXQQ +Iwq+NuXmDUZvNUNHq1h0sjnFL+NzEKgiarb81Mq5aoAuX6A9hAookqGE/kvoG6O6QzL UTPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=cguNTcg8; 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 cs12-20020a170906dc8c00b007833cbbb747si8544834ejc.578.2022.11.27.14.47.34; Sun, 27 Nov 2022 14:48:04 -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=cguNTcg8; 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 S229705AbiK0WNb (ORCPT + 99 others); Sun, 27 Nov 2022 17:13:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229533AbiK0WNa (ORCPT ); Sun, 27 Nov 2022 17:13:30 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2F30F001; Sun, 27 Nov 2022 14:13:28 -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 4NL2tG66KGz4x7X; Mon, 28 Nov 2022 09:13:25 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669587207; bh=OA8cwrc4AeSC9IBQ9abRGC2/KKssQi4afT8E9LGyKVk=; h=Date:From:To:Cc:Subject:From; b=cguNTcg8P3fCYHCZLFPddlZ097kZ8OdMn3F2dPr5la/i53ksyND3qddeSvosbhq1q aBvVGs/AQzTzQm17gruINIaMRIksABsDIfvmR3k2sxX9ohZtXkCWkoq1SQDN6fBx3h I+ox5h8I7WvpOXh9voiOnvIleGeeCt9eM89qqReTbb6SrIfev+aaxnR3Hg/767YruF +tIGh9nYviqLvliR0qg49qNcqDuAvjXChMTQ0wMLzUMgI9MSPPmNTXIX2AGMAR5rYq GpnoPzxi2qtqY56h+wLezDJxt4HG09kYjxI2CPQ+XXc8xi0/VY1CjJGMgN7/LcQmtY 3RCFPmzS3LEKQ== Date: Mon, 28 Nov 2022 09:13:23 +1100 From: Stephen Rothwell To: Al Viro , Gao Xiang Cc: Gao Xiang , Jingbo Xu , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs tree with the erofs tree Message-ID: <20221128091323.246f8ce1@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 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?1750691253455843840?= X-GMAIL-MSGID: =?utf-8?q?1750691253455843840?= Hi all, Today's linux-next merge of the vfs tree got a conflict in: fs/erofs/fscache.c between commit: 313e9413d512 ("erofs: switch to prepare_ondemand_read() in fscache mode") from the erofs tree and commit: de4eda9de2d9 ("use less confusing names for iov_iter direction initializers") from the vfs 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/erofs/fscache.c index 3e794891cd91,4c837be3b6e3..000000000000 --- a/fs/erofs/fscache.c