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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78DCBC77B60 for ; Fri, 28 Apr 2023 05:37:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B95FA6B0071; Fri, 28 Apr 2023 01:37:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B46E46B0072; Fri, 28 Apr 2023 01:37:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A34BE6B0074; Fri, 28 Apr 2023 01:37:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 96DA56B0071 for ; Fri, 28 Apr 2023 01:37:02 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 1F5E21A021A for ; Fri, 28 Apr 2023 05:37:01 +0000 (UTC) X-FDA: 80729691042.19.E2A972E Received: from verein.lst.de (verein.lst.de [213.95.11.211]) by imf20.hostedemail.com (Postfix) with ESMTP id 2C0811C0013 for ; Fri, 28 Apr 2023 05:36:58 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=none (imf20.hostedemail.com: domain of hch@lst.de has no SPF policy when checking 213.95.11.211) smtp.mailfrom=hch@lst.de; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682660219; a=rsa-sha256; cv=none; b=hW9nDnT3fJvQkJfh43RMKQC9sE7AfszmtD60lstb4FfVTLvFgZ7wblIe5cNnR5AR4sQDQ9 zJ4kN4u7ct4KmTc0rT9X2Iw0hwLyefofq8/ZKJ50tc/lJPp+baaRK+CME6xTU+fQa9qTgJ PqUy/FoPQrKU+xMKz2WGr7fGZkg6uVc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=none (imf20.hostedemail.com: domain of hch@lst.de has no SPF policy when checking 213.95.11.211) smtp.mailfrom=hch@lst.de; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682660219; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g06viw8FExZvo1nv/75YM+uj8zaStfPqG1DsXQzESeA=; b=DNccM66FaWfCK0qxul2FJyC26OESVjDzOhNBQ8WIkTuIvppm1F87XCNqz6cA6zNodXGF5v r2u0NONkOxYSWKan1nxoGiePTUj4239eeCfW/s8AocC/xLzFX4tpk6Uo6lxZQcwhWhCwNs 28p3OpQkVuR9g2D75qWk47xJa/wnYW4= Received: by verein.lst.de (Postfix, from userid 2407) id A426268D0A; Fri, 28 Apr 2023 07:36:54 +0200 (CEST) Date: Fri, 28 Apr 2023 07:36:54 +0200 From: Christoph Hellwig To: Linus Torvalds Cc: Andrew Morton , Christoph Hellwig , Matthew Wilcox , mm-commits@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes , Vlastimil Babka Subject: Re: [GIT PULL] MM updates for 6.4-rc1 Message-ID: <20230428053654.GA8549@lst.de> References: <20230427153345.451d86681f9c6775ea579e5a@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) X-Rspam-User: X-Rspamd-Queue-Id: 2C0811C0013 X-Rspamd-Server: rspam01 X-Stat-Signature: 66mmwcay8bcu1p7xjm9sxzuyet4xi1gd X-HE-Tag: 1682660218-103359 X-HE-Meta: U2FsdGVkX19CQxx/WpkqChJS/xxugjF7YpqLONkrD7ADT5gyoCOlYUDK7ZAISxhJkVTHr6XcM/8syoDARZF2svgCzIDhy9i6LSphX6WpangTXjyy3QPF3HEEd4+M7lV5bvOCDCXDJVuQudgnl4GfWMkFdDcgkA+xVMMKOgRjvpDATGf32IgGzXeA5Hvc/2YCmCA1kT+qJ+6ft2IAKWBzUBi64tGHlIdFWOJ7fz832nkBf9v3A2NRDTMBqTtpOftT+4Nr0Qg3H5zWMj645W7TvnwvKxe9htjZU9XTNJQz1/GS+JDGZ42N9KB1osZaCISF8bBuY8dd47FF/CHK/rsMr7a7drV/9MV+b59r1Df3CqP0ryhTg6EDpw7Int9Stud6QudML1e5fjQfLY/tpALKKKIW1NSkOnlhK1Y4cDCpAbBhpC+d/nTA+yfIBdCP0QbufmwVWGXbwmfuyjIonpUu9/RxRRIuEOi6HtK9quhs3vVLuwTEhQqAByP7De/xKxIuLo1ZOo2/sW3KZE8UXurS4droB5BYHXY6y8NfUr7DnpVPFyf2Y58ZeGA6hmJ1wHgBnn0EJTNIfuNcrLZyEuU7b5gdOrSkezxfCrMaeVqV13r6MBtqEIs3bWzDp101YZLk1gsFw3YeTpgKzHPwKExgdl+zqVQIb5Da0XFry/A4iZ5oxy8l0sfYJOaTlk/b3PmQj60UtrT9yUqxkqbFiKmlAXs4ustACVao8iEYYsBnECUZJNiQufV29X9p+AWtEHykkfAabUdh/em/JT60Bp8wpAOiPa8v4iF5Aq0nh/6qxAM1v+PdQ7HbfMKT0QcltlY45xmqcMJxAFLxg5awVuJ4Y+ZYmQpgvY2NF8re3UxXHgQxQhy8izudOAxitZXJCyOQJUhQyNdVfpIdeA1laqrWS1FexwhNzuMj5xNRTg9j7PDdTIf8Z+Ct+IGmCqAuMjMerFWeGOyYSWjL/FeUnGe H60Q391+ BMQVbN9ZfDJ8GJzgrJguHwLTYsVR323tajXXl9I16L7j6shEcdvPOi6yanK3l7V+mdt7RcG2kmy/rTUs= 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 Thu, Apr 27, 2023 at 08:15:56PM -0700, Linus Torvalds wrote: > Most of the bulk of the conflicts were around __filemap_get_folio() > now returning an ERR_PTR, particularly then with Willy doing the ext4 > folio conversion. > > So Christoph, Willy, mind just double-checking me? The merge looks fine to me.