From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAD8CC433EF for ; Thu, 12 May 2022 11:52:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353475AbiELLwh (ORCPT ); Thu, 12 May 2022 07:52:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353469AbiELLwb (ORCPT ); Thu, 12 May 2022 07:52:31 -0400 Received: from mail-yw1-x1130.google.com (mail-yw1-x1130.google.com [IPv6:2607:f8b0:4864:20::1130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3CFB95A17F; Thu, 12 May 2022 04:52:30 -0700 (PDT) Received: by mail-yw1-x1130.google.com with SMTP id 00721157ae682-2ebf4b91212so53031807b3.8; Thu, 12 May 2022 04:52:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=/dMbgdBJ7v3pnBezXlQe7FuBpjFL4Jdp9pglUsY9h+E=; b=bwHSTj48doUHYMQ03ZT9x79VcE56FNIvqBd+wFsZM3TVznihbaMuCWZrYpMTrmBklt WFPbz53jGcC4FiOJKnhl7gnA/SlM1WZoYzQxo8rGv5lBcgqU62caUKliesftqzSd4BkD XzCuCpODHIpFS0FO1ue8i75Qcem8Cm6DvYvDRfmYQs/IzNeO5gsbDRWb9hj+VUwbM7B0 +0NFK4h2BIb0E8yakepy8H7HFoFsjqNp/0K/YLLfJuCL3uJMmR06xGXeUky0oLuNDmYu PijqAwOwJwGfD03qyuo5R5F/eSWr3iflL+dU0on0zgyBOZFgYMqNhJO3Ojyd8H4E8//x f+/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/dMbgdBJ7v3pnBezXlQe7FuBpjFL4Jdp9pglUsY9h+E=; b=ty5FVNEgjVHlqlTY3XyYUa/4ecz6bsl7G5rEPVc7eUIcXt6QMLCZPH7zag/tznrzkw 6RAcPpeZacvsI+yXKcDgwJeNm1uKcMlstQG4+i3VLch5NIKuEK6LJWgpU/LK+zjEO9Vy BXIhO5s0uQtwB5o/eSmCrz35rH0C0v5K0gAw+tCeDBNK+ZhPyIrmAGEbcmbFS2Jxwc2b 29YdC5ZzoTeNG23xuLeWxNKOOKtvB0wm7cig+yjmbivo+ckJt23qLXVtFqzXEp7DKxBA X4RPFUneiAmdZlJplPCzqLzNlU5ITYdWUOHwjM1wNOZfOKUGJt3NjuZJcsajQrOSQLy1 RBqw== X-Gm-Message-State: AOAM530WWywum6LCCkEWd2LNHC75kAS1QwuFlFk/hGu5NYi6DtVKoNUT +rAfAN4S+7aq2wDhzK9xcRLimYfI8tz9TSlBTSDxV7KY3KY= X-Google-Smtp-Source: ABdhPJyHLt04itFWvdt6UCYnDY2Rhaj5egWy7kMuPfcxwY3R63u4BIUcD0LZ8nE5vpIUqDGrHIsEzSsL2I9GB7R4E9U= X-Received: by 2002:a81:949:0:b0:2f7:c45b:e291 with SMTP id 70-20020a810949000000b002f7c45be291mr30288622ywj.503.1652356349352; Thu, 12 May 2022 04:52:29 -0700 (PDT) MIME-Version: 1.0 References: <20220512182650.7d1a94c7@canb.auug.org.au> In-Reply-To: <20220512182650.7d1a94c7@canb.auug.org.au> From: Ryusuke Konishi Date: Thu, 12 May 2022 20:52:17 +0900 Message-ID: Subject: Re: linux-next: manual merge of the mm tree with the folio tree To: Andrew Morton , Stephen Rothwell Cc: Matthew Wilcox , Linux Kernel Mailing List , Linux Next Mailing List , Yang Li Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, May 12, 2022 at 5:26 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the mm tree got a conflict in: > > fs/nilfs2/inode.c > > between commit: > > f132ab7d3ab0 ("fs: Convert mpage_readpage to mpage_read_folio") > > from the folio tree and commit: > > e38ed506c42f ("nilfs2: Fix some kernel-doc comments") > > from the mm 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. Thanks, Stephen. Andrew, please once drop e38ed506c42f ("nilfs2: Fix some kernel-doc comments") from -mm tree. I will resend a modified patch after the folio patch is merged to the mainline. Thanks, Ryusuke Konishi