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 33B5AC77B61 for ; Fri, 28 Apr 2023 03:25:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C17AD6B0072; Thu, 27 Apr 2023 23:25:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BA08E900002; Thu, 27 Apr 2023 23:25:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A40B26B0078; Thu, 27 Apr 2023 23:25:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 919796B0072 for ; Thu, 27 Apr 2023 23:25:15 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 59A0F4018F for ; Fri, 28 Apr 2023 03:25:15 +0000 (UTC) X-FDA: 80729358990.28.292BABB Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by imf29.hostedemail.com (Postfix) with ESMTP id 4790412000D for ; Fri, 28 Apr 2023 03:25:12 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=eGvbuwPn; spf=pass (imf29.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.43 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682652313; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XtcfavXCgC97sXeM2tBhYDMeAO+0wKfV/28poedCpKI=; b=dyEc/qlQsbi0kokxKCY9g7kC0cajRwSWMf0dum8Tbqob8e2nWkEaapnGdc3ZvgjpXeW8d0 QSMnuQtOdc6EyU/Gx5bYmpQywji8O2P1YjJxesXuedUDX8O+qMZ/RiMV10qzZOj497blgH 6J+gPVA9BO+WNvkidlGylnKYcTq1K2o= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=eGvbuwPn; spf=pass (imf29.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.43 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682652313; a=rsa-sha256; cv=none; b=KEi38vT17fNX7YM6/T1ZCrvt8c5llrDcp9xmx1kBmHTSdC4HjQvEo5pfu5keTJ/KPufEM6 TgqsuGNEXxjrA7svNxk6ZBECdL5YjSr8tVyFP3EeMza4oM2H3K5OLuxx+TAmMjLrzIxfTN /JMDP7ipUkq53ki1jaJ4N1TqO/v7qVs= Received: by mail-ed1-f43.google.com with SMTP id 4fb4d7f45d1cf-506b20efd4cso15768625a12.3 for ; Thu, 27 Apr 2023 20:25:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; t=1682652311; x=1685244311; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=XtcfavXCgC97sXeM2tBhYDMeAO+0wKfV/28poedCpKI=; b=eGvbuwPngN5eh8s2qx04NIVRYGePJ2BrMcx8RZMZyG30Qana2OUuckQhxzKhr3UTSO 5LoxVeOCIQLPiEyqi84VGNaqjaYIa3ciHotnSHjOSeQkCLRX78rq0onFe7Gx0kyiVwDc V/wscIV+WgGwx0NlyGNLfpg39xBgAIMR3eXjk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682652311; x=1685244311; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XtcfavXCgC97sXeM2tBhYDMeAO+0wKfV/28poedCpKI=; b=DPFpIwufmBG3ef21eZOJpMdbCanGJCLOyps/J65UH5rGZo60Dm9Z5hpA2Gx7Kk3EEQ lTQ+PzvA65gWmsGsZL6eYmfKVhqsyR2Xec9ElvLZnHWpwlEGJOVyr9K5XoNHrXHTt3yn /oSMZXgC0jcYvC8X0hUD2OxaQPs6q/PeN4kYRrlnCfG8k4/jmMzHZmR05aM8MbRVuB/N HCNfQbX4VNpcBorA8ZIAJg4iJ73HowtDAzYobC2Lw69PaXorQPYEa8KGr9p1q8SmXNVC 3V5EQ0Tb7qCuIsOjVbUSYc5NAzWrcdUg8gnksM2Rl00exn4I97QGejg2pN8E8A1kyDqK 6CoA== X-Gm-Message-State: AC+VfDynMSvELTMuZjuKKuIaqH9Z8t1ZBLiKLyO3kXGjilc28622Yrzv sGQSfyE0j5IIaZwpU8mRHDVjbvKBdMGErlxdf+5NWA== X-Google-Smtp-Source: ACHHUZ7VCVAfWqfwtog0+FfNhkHFLNjhhLHcrAQKkV34wFHGZWrUzwdSRF864faESHDw5a0F7rjCuw== X-Received: by 2002:a17:907:d1d:b0:8ae:11ca:81de with SMTP id gn29-20020a1709070d1d00b008ae11ca81demr4033574ejc.34.1682652311513; Thu, 27 Apr 2023 20:25:11 -0700 (PDT) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com. [209.85.208.48]) by smtp.gmail.com with ESMTPSA id wu9-20020a170906eec900b0095847b8d46esm7776801ejb.65.2023.04.27.20.25.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Apr 2023 20:25:10 -0700 (PDT) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-506b8c6bc07so15749270a12.2 for ; Thu, 27 Apr 2023 20:25:10 -0700 (PDT) X-Received: by 2002:a17:907:2d8f:b0:957:278c:fb27 with SMTP id gt15-20020a1709072d8f00b00957278cfb27mr4205144ejc.21.1682652309848; Thu, 27 Apr 2023 20:25:09 -0700 (PDT) MIME-Version: 1.0 References: <20230427153345.451d86681f9c6775ea579e5a@linux-foundation.org> In-Reply-To: From: Linus Torvalds Date: Thu, 27 Apr 2023 20:24:53 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] MM updates for 6.4-rc1 To: Andrew Morton , Christoph Hellwig , Matthew Wilcox Cc: mm-commits@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lorenzo Stoakes , Vlastimil Babka Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4790412000D X-Stat-Signature: wc561fxif7gdesg4uafaua9i5ez6g1o9 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682652312-313758 X-HE-Meta: U2FsdGVkX18GmlHqR//nG1ufQqm+IyEtNq/XX9chPp5fDMmSmcRgQhFSzAoFjAYwqlBHcm3ah3tw4Yj0S8xSi7s/zDt7g+sbEg3leiSV7XkpDtB1qzM8qPRs+z/hADzUKdAgd6OOvQFcLmDU5ackdZ/6odkYo7/u7mP2TVE36FBIIOMzf4mRmBp1DefsaBv26btTtK/WcE0Tnadf9Kl4jkFjSK/e1kINseXW6CKCT9FF6WyfVGlOy1+BVFBh90U9PkARvoQRYLR9PvTej/t+wxgK7IuU7sQQ0qTLIxq4dcpGfQldB4+kxy834ahfIJh7vwnM28sOyEoXpMnDGQjsyj12JFeGRNxuvJmfBTckfSYm6FFPJuBsa2G9zWTAgV4U+gv4p67xy9q+fpYNF3kKEGXUV30fZKBljIz5Snn7u+toBY6Vj+bsXe5vP7Z8+KTw+PsNWtzMKjr5pKZdk2DXd40w3wM1AIw6r6ByO6kmpLEKaj/WWQQORBOWYE5UT8i1/J4yciWdiGAtC+mRmb27EiCAjzsyPlgxAzMfRDuSxUvpH9U34J1eCri+CCk85C4M9NrF6hic4uZEd0c6nUl1kpFYcgLI5sR9u9zdtWYvOswn2766jU/v8ktk1x++UqNsxp+qyT1oZDCo1LmmuC42QZkxvCgnhJUWtSe1wuASSpiltom5WSRuw/+1wS46F+I3fTUmD2kVKpe95OjJmensAMVCgxJ8U0ih0hgx7/Hev2OUxFKUJrh5FyNNMcoIkcX/nTwhq3qCBk2bqeyJJwBwBRsc4RhTe/8sY9FOvg2S87oFPhZlYYJvi58AiLiTiCpgSYF4o9RsLV1Znu1JaoE/9xWee1HpznVwGerJa/bYFdy2faP2g7MTek7Vb00rIEVbQ9yKOHobV4fnTjcs2Cq0CGWrmC0hS+2UaQovCUTCqA0ZrIR/0X3g7gb9aocnqTaZbPm7HZuMaeoeie+L+2D c3XteQwb cFYPAfdghy665azeTGsT9XQ17rf9XmVzuddpHSFOQeijuHZTpUsvrBH929KQQBr2feVq6G9xRSmFzsAVZMPUAa6y0EhZ4RnLNvavV/0MhQlnfXQU1GP7nQHsS7qIDWdj4N+BuusIO+gNL+6rux1bO1xtYyY0tJ1FoFPnl9nk0AIUhAnL9Z+3ap1J5JyH+HV+enYGmelgb5fsim0zD55ee8koJEdoM2pc+o1eq68abfG214MrWztcpy6ABfw8XsLNY6rkWaX05xgGUdnYv36DaL88anc9nIU1Uo2KiGTsAD3iiYLuYl3UIvMvU2VOkUMOa69fBfhGyJC23dJ0e7tXBm6O6raR8UCxOZOwd1KAbXpWriTm6WD8foe2LSYd2taQN8cM6ZAoe+IBMc4pwNE5O1PwAbMzskUU2ADOX1G+HM3AKlM/mu9w7OT6/r1LlLtsF3zSUEHLUs7DP+vr+aNnGoA+2elk6sq3NUenfU4d/wPOiyqLsJVdWSBmzofs6sDLp+ti2O2KCRtAwJLPwarfrHlJ5IdysvJr8PbJClFmgaTor+q+9QmS/0P6aVQ== 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 8:15=E2=80=AFPM 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? Just to clarify: I do take a look at linux-next, but I do it as an after-the-fact "let's double-check my resolution", and some of my resolutions don't end up being identical because I end up doing things differently. For example, I found the linux-next resolution in ext4_read_merkle_tree_page() to be nonsensical. I think it probably generates the same code as my resolution, but doing "&folio->page" on an ERR_PTR folio is some funky funky sh*t. Only after looking at the linux-next resolution did I grep around and notice that that kind of funky struff had already made it into mainline in non-conflicting places. Willy - it seems to be you spreading that crazy pattern. Please stop. Anyway. I did some things differently, and while I think my resolution is the right one, the fact that it is different could also just mean that I'm confused. Linus