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 4E595C77B60 for ; Fri, 28 Apr 2023 03:16:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1BEE6B0072; Thu, 27 Apr 2023 23:16:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BCB536B0075; Thu, 27 Apr 2023 23:16:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A92E16B0078; Thu, 27 Apr 2023 23:16:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 970AD6B0072 for ; Thu, 27 Apr 2023 23:16:20 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 74DED1C6692 for ; Fri, 28 Apr 2023 03:16:20 +0000 (UTC) X-FDA: 80729336520.27.2900876 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by imf11.hostedemail.com (Postfix) with ESMTP id 5EE564001A for ; Fri, 28 Apr 2023 03:16:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ccjPEIRY; spf=pass (imf11.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.218.50 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=1682651778; 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=W7sdITuIFnEQoKW0N5OSKzGyU3doRmglDS9WyyDhnvg=; b=lV2GWNY3pswvPT9iCawtPIhtdIZaGfJGeVkIcNqbbjxsLZ1VwTEsgfTqvA3O6BpfJnSs7/ y+xf1qDHPFpu+5zR25tMs5M22mdpkuF6wBBdNpp+sXy9WDtM2L5zFceSaE0GHtv84ajNhT FdM48ABKxQATa9tDvN7fMRVLHN98HYg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b=ccjPEIRY; spf=pass (imf11.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.218.50 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682651778; a=rsa-sha256; cv=none; b=bz8Px5BhXG3OoYzeWlAw/3IlwDaLKklgimZXJT62TuPOrp+s+g9i7pk1t5jl7ZCkYgFKhk P0TSqaVA0fSIx2Um4uvu0un3pWfms2fW1ffv7MtgnjdXCVAv+4EkalL8R1eRFYa0bZPyC6 xUuPaupBzcCkXi58+41v84oVk5pd+tQ= Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-956ff2399c9so1674138166b.3 for ; Thu, 27 Apr 2023 20:16:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; t=1682651777; x=1685243777; 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=W7sdITuIFnEQoKW0N5OSKzGyU3doRmglDS9WyyDhnvg=; b=ccjPEIRYLyHZE2inyG0l4niBaEYNE2I6t7NjhEZ2vkAhEZmVmfRTiLYef/ofGxNvbh kbVrPeMnt+DS/WpaIyCpVSJwmhPBBBTGXPX9i7U6lF9V9Ztx1fwaR6qhx1kR3h94dkN+ qPbh7BituFBREYHnY3dCeqGSebz8j3xtWvJGI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682651777; x=1685243777; 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=W7sdITuIFnEQoKW0N5OSKzGyU3doRmglDS9WyyDhnvg=; b=UVJ6W9QK8nLHFGWk/swZJHUPBEZFlqgdh5DtoeEMC211Psdyi5oiuOJ2iIdhUIMzaM 3qiksPBB6pdEUjSmY9NlKNRrkqRzlZ8xMOs231woQQ9PX0Ko1kTVECxx7t7HAVv6U2Aq XoZ5htt9QgtMOw6zYs0LZm5n9ZD/ozXiZh/VoVT0SraNFaVHMNqx9QXfsokoCpAFyrMb YoQ8mlVAVQyap1wrNefvFlg4cCLvV291pq0aIdG5OGS841zUt071teCcyi+IVCXcxCuS gjRwz6Gl9bXO2Qya4Y9kV06prkOAv2QJabZtC8c44M5vh1o7HdYN4RaZc+YyZ3g3Pgjs oEpw== X-Gm-Message-State: AC+VfDzv8bZcSGh72RCT7ZOt8ZqsF0NHUI+LWPBiScqSNxpkh2EXIdFR TGgU/hC1VaQZb+Zb+nodF4Fut2OlLorzeKTQ9BR3rg== X-Google-Smtp-Source: ACHHUZ7HIulpgHzy3U+66AOxK2O0RGU6C1ndX5e/CsTeeojqEhujf+2mRLJ4HyiHeBemYWpYH2GxVg== X-Received: by 2002:a17:907:c0d:b0:947:71bf:ca19 with SMTP id ga13-20020a1709070c0d00b0094771bfca19mr3943167ejc.65.1682651776748; Thu, 27 Apr 2023 20:16:16 -0700 (PDT) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com. [209.85.218.48]) by smtp.gmail.com with ESMTPSA id v15-20020a170906338f00b0094c3ac3c2bbsm10534598eja.212.2023.04.27.20.16.14 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Apr 2023 20:16:15 -0700 (PDT) Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9505214c47fso1752821366b.1 for ; Thu, 27 Apr 2023 20:16:14 -0700 (PDT) X-Received: by 2002:a17:907:5c1:b0:94a:90e5:b2b6 with SMTP id wg1-20020a17090705c100b0094a90e5b2b6mr3512007ejb.58.1682651774330; Thu, 27 Apr 2023 20:16:14 -0700 (PDT) MIME-Version: 1.0 References: <20230427153345.451d86681f9c6775ea579e5a@linux-foundation.org> In-Reply-To: <20230427153345.451d86681f9c6775ea579e5a@linux-foundation.org> From: Linus Torvalds Date: Thu, 27 Apr 2023 20:15:56 -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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: dokkga4mawh5uk6fzbszimim51tyyq7f X-Rspamd-Queue-Id: 5EE564001A X-HE-Tag: 1682651778-632477 X-HE-Meta: U2FsdGVkX19+jqsL/k6twbFFuee71sAPQ7dQZ/OIWxdMa+EkKjWvRbmju1XDj4xZBjGXKNjpmxZE4h7+AvSk9J56yQ4umxsu3AhZ6WHyJgRjufXTU8Pl/rfZZJCDkhOpMqCJ1ZEvNzFTq/2Fr7yrxexOUgkCBj/bAigkNqqMBiaqBdgbjAflV8GZuj+mWA1Aji029RA/NzDYHaUsZiViK+22/U21nk48Y0wvo02gOZugP7rAfKyVSnlop6WzC+97HwM8pczuFxFc2k5vfbFRB7ZWUHbu8W+3NPnImX62BJpNTLv6JWaacTx8ogNcy1I+T5nzj+cDGv7ZWvMn/axkjXr0z+wEORGVfZ0srb8vqtdN8sSX0/rz7lbHzmf+j2orRLypuqYjen/yk1iwzmVE3gFGKSiBkzhAOflkOrjZEUrasMjAcJPOH657ExQNoto4Z1bK89B007O8QszAUcEe1p3WbxWWjGSRDZ3clLUX4cCZEi1r13GB6hruI3/s9h6RUSKh3SDL2iJhuMWZfiePYicU9kvQa3Lu2m4ga9G6NcY6iQUc7uh6QnSruudXa0f1f575FmnpNjUw9zOFzaH7/YH0kh8MgWuxHYSejK0KNl/Ax4Mc19nO2Qre1lMBo3e56nP6LOhUmvnmm/O8qfcxzYPNo7oSz07z8y1BEncpms1CZKwpKWI9qHT46thcuYaKH1wLhAVHHYLjpqmEj67ZIslEv6zDI4XE/6JsJf1q7RCPQS6m1b/WampVeq5JPBd5vVGMVpZvXGa7YFlbloWgjfTkIHWC56M6P0ZnG5gpew4wgTBed+OiVTsloeF4qC8W4Ujnb8G6yN+Fpq+KSE2jfXh894XCKqBskEOGi+MbKsR39rFx3TyOYPuWbZwpAagowyXKhCOV62cOe3ND2Unsv9M/Zc/YZKj0Pn7qNBuSh0ga/nPKxhms3E3+JGlsfJ2+IlkwEK1GH5zCTdTFThv I39n1Kne /h8F9TfBUq/C41HlVxacEAUCMrP2CRQ54dqCwtXqb9dQarxAJQNYgvk/BY64EZCjPcktVCFWb0sHM/8IqlXFqzMOoKYr1v3sAA8VfPIkEc1Z9vqWVc8Uowiqfp1U8tP9OYJysri0kwGduDbeNObLezutd2UXRMRTyBq5xfqnQJiWYQjqjisQ7cFT6FkETxonZh5E5ofKJstvyOM6Rbp3sxCf464KUKeHEJts51nrAjB6746UoSUFUR5SVbdjCZT7zDi2/CQlRPBnzhpwPeSK1yEvVtk+e7sUR/aTQvdo9TOdXbPTKfgRyodVncPsz1uWvSOHg7rQDrzcJWJXTWYT+cvGtg58dYD4czQirAXaE66QmB07JsCqdoWaHMuaqILXnz48hLLGdGQcaaqBHo7vjICEJ/0Iv8jOqrF2ZXPQaKeRl6BpySRGhouOLEmGVeklQCv0JiGXXtGoqTXaW36Xz3V1l3CEeHzhJV4l0BRsJGykllfAopvQIPuikuXDxizhYQPPL/hBXeI+Cy2j3mzmqAc2oD5aekZfB9DbE4tnM917ZL04wXsRTfj3RreiWPx4vegdw1klzkJMhxA+1kJYVGCaZZs3OyB4sOXwyJhYmvH8eZTLcgXAV2TrjFhFIiCvWygGL39bGearukYY= 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 3:33=E2=80=AFPM Andrew Morton wrote: > > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-20= 23-04-27-15-30 Ok, so all the merge conflicts looked straightforward enough (except the one I asked Vlastimil to look at - and that conflict was tiny and straightforward too, it was just in a really grotty place). However, let's not get cocky - so I'd ask people double-check my conflict resolution, even if it looked fairly straightforward. Mistakes happen. 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? Linus