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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E411C12002 for ; Mon, 19 Jul 2021 03:58:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BB60F6115C for ; Mon, 19 Jul 2021 03:58:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB60F6115C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1E85F8D0105; Sun, 18 Jul 2021 23:58:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 197EA8D00FA; Sun, 18 Jul 2021 23:58:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0606C8D0105; Sun, 18 Jul 2021 23:58:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0202.hostedemail.com [216.40.44.202]) by kanga.kvack.org (Postfix) with ESMTP id D52B78D00FA for ; Sun, 18 Jul 2021 23:58:01 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7833E180265A8 for ; Mon, 19 Jul 2021 03:58:00 +0000 (UTC) X-FDA: 78377979120.21.4C6203A Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf20.hostedemail.com (Postfix) with ESMTP id 17FF9D0000A4 for ; Mon, 19 Jul 2021 03:57:59 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id EEA6561019; Mon, 19 Jul 2021 03:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1626667079; bh=74mnq9POIjkOzdX7U1+ISYLcUiJ47t2g2jJJCDgV+hU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=nRaDse0mC/hTb8q4com9FwM6TYSCveSDnwapkUzlq618xbTMDaqVZGcpmfop7rRLM Mxjhfz2c9wjM09Qgw6ScPXtw2Ky6/GJnEpmdPHUYR9UyDc47sGhm/MWQSBeR7fWQi4 uwUn29HQwAt6SRC/9w4x6z83pbgLCsQB4Ng9epwU= Date: Sun, 18 Jul 2021 20:57:58 -0700 From: Andrew Morton To: Matthew Wilcox Cc: Stephen Rothwell , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Linus Torvalds Subject: Re: Folio tree for next Message-Id: <20210718205758.65254408be0b2a17cfad7809@linux-foundation.org> In-Reply-To: References: X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 17FF9D0000A4 X-Stat-Signature: taqz87neyk37krnnstb6sstouza4bzw7 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=nRaDse0m; spf=pass (imf20.hostedemail.com: domain of akpm@linux-foundation.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-HE-Tag: 1626667079-354929 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Mon, 19 Jul 2021 04:18:19 +0100 Matthew Wilcox wrote: > Please include a new tree in linux-next: > > https://git.infradead.org/users/willy/pagecache.git/shortlog/refs/heads/for-next > aka > git://git.infradead.org/users/willy/pagecache.git for-next > > There are some minor conflicts with mmotm. I resolved some of them by > pulling in three patches from mmotm and rebasing on top of them. > These conflicts (or near-misses) still remain, and I'm showing my > resolution: I'm thinking that it would be better if I were to base all of the -mm MM patches on linux-next. Otherwise Stephen is going to have a pretty miserable two months...