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 68A37C636D7 for ; Tue, 21 Feb 2023 23:37:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BE2C6B0071; Tue, 21 Feb 2023 18:37:00 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 946B96B0073; Tue, 21 Feb 2023 18:37:00 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E78B6B0074; Tue, 21 Feb 2023 18:37:00 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 682AD6B0071 for ; Tue, 21 Feb 2023 18:37:00 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3C0458062B for ; Tue, 21 Feb 2023 23:37:00 +0000 (UTC) X-FDA: 80492911800.01.A67E725 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf09.hostedemail.com (Postfix) with ESMTP id 5A5A8140010 for ; Tue, 21 Feb 2023 23:36:58 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=AjKPkSRn; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677022618; 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=cw+z9DSEg5BdBXsb60Z2KnQ5kvJNIx/DJzMJbSMm4ok=; b=N/irFKcB+Ry/bbay9IC3nGu3JKUUUAs2blDDs6ukoF0uXaVo2fXedFNlK89aZPPAsRBCh6 i1MN+8rJyrW/CkwbhQ/KTON172QLHI1mNFDSRr8GTNAUf96ZTByv4Q2+3xW8GgaCKg0cIu G3WM1yjVKIOPB/pzFIqNBKd4Ea6OXas= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=AjKPkSRn; spf=pass (imf09.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677022618; a=rsa-sha256; cv=none; b=JzPdBFrlgp481RBc3VbcaM8eqBYS6dl+AUefijtCg9vkfWZQkuaJPdmALzvQu+CYqoo+5z d5enA03+bMl47y7z8ssTwNk2xyDBhrU4NARDR6tYVK9tTuOW+CqV2UbSbVmzZYihdN7J7d JfqnFgyioNwKwmf8uCkyDoVm8TERmIw= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B5345B8103F; Tue, 21 Feb 2023 23:36:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F719C433EF; Tue, 21 Feb 2023 23:36:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1677022615; bh=t9PflTmR8D8YpQ5iwtxgUyd2ZjSOHE0PBJApANbv1Hw=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=AjKPkSRnCSyp+sS6avbhycvr5Ly2ovZWDFCYyGwPf6Crq/8V00WZagu16v+WARNT1 SeYQKAYfdg0WTmA5MCXCmMF8D7yIi+N4+EWuu4Njkn15wuf/RPQRmtU89Oxsunq3XS KiRqRxXJQLolCosvGV/jCOWHJy6eivudMVoJsTxs= Date: Tue, 21 Feb 2023 15:36:54 -0800 From: Andrew Morton To: Linus Torvalds Cc: linux-mm@kvack.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, Andreas Gruenbacher Subject: Re: [GIT PULL] MM updates for 6.3-rc1 Message-Id: <20230221153654.093d16a9ebe455644fd805ca@linux-foundation.org> In-Reply-To: <20230220135225.91b0f28344c01d5306c31230@linux-foundation.org> References: <20230220135225.91b0f28344c01d5306c31230@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 65de1wbkpc6f8xh5xfspo8mw5u8c1mbx X-Rspamd-Queue-Id: 5A5A8140010 X-HE-Tag: 1677022618-493185 X-HE-Meta: U2FsdGVkX18AkZsGnW+R/2HGwC9/ihv85U34FFtoTFZH7Lw1Su4k7yEuJol6OnPq2/iVZLVhobldaRF6hma1Qa0a4gnpJixclHX39YrxXhWLgvzHAvLSVQfl80yvUiJq3/8SGoQv9MX6Nuw/6/PQlypxVjfZRLWcmWO16eqKrUrUrdeuCKgvO+zJNamHEgOHuh7W/CMHqH4jeL8VkyvW+fptSc4SZH7no7KeMv2TvdlbzhNQI5DifRf65nQvc+alYL5QzygFW+owkQ2lQhEC4bgdo3H5YoVJk4uOYd2Ca+lAUrlVi50etK2YCaA25hOl3mRjAegp1LCKCjIaH29ksJtZzVf99f/vL2iyoTiflZcsG2HXpmG4NUy+YYp42ta+udPYHVMjBCsajQqSGQzJhxnZlmGfub0P5nYrYzp2V4SJmQKk+xXH4p9CXqRRGMXVvp1QfAO3eTazYchpi0B8AQmIxyEjER/UEdGjtEc5K01VxMG9TIbhOqUnYtzydV1skKWIr3f/5CYPhsGOzVLh3P1ozIXtB1rSz0pV17T6Jowc3BRrhLdqq/vdm2DF3YShQgRJDGF4aIM4BiAQnPuKcy4/iNc0pJo4pCBmRFKVQ1+1QmccrjF47BYtpnmut4F+xOMw+tulWxwSpEQ85G+4iOHhHdXbJ4mo/4ZjZXoq0bGJK69az+h51iVF/T/508dL4TGY4mH17btqvkihk1rxMlbcx0eqH2Tja2v4o0Pt00/94Z5PvCouqM1h+dhPJOmVKyTVI4CdNNf+MPjg8t4RGXaAxmFRpJN/XyYXVYg3ZAej20h5NVXGr6aWnFT3JwhsPWGX1RTCrRoMIJ3lQdFxOHUuKazLWnJUTT1z1oZBs7Chozy+QzNo5XSqQlDWKKXl08vj45prabwT/bLHobGvOiXDkKoA/QQdkHVC8vJy50woDKBMu8kqfNZP4/7HrWv0zGLyjNup2pM8WyyRWOq P+XcBM1S cLuh7DoCw3lf0ssEW8na8E5Raeuq44CPDeYYON8x02uUhakZ3Euw02v4vfHH53lAJlioYg7kdI3MhOiFbuMuhJYVvRKzAbffU8sxoTP+Szq6lWAEHnEhBH36y7PMxZ1IBQJT1Sk/3Zcf90oVynZBmd+MiEJXUCN00ssRYIgKHU200JZTsCb2vQp20int/RqGGob6B34GzdCXjHxbPd/e+mGmVYY4FGVRBE5E0ghe+uu1njSALz92InmRMZNYbvDYtLZKl5eTNMjgAVYXhiv8WWvesrXuGUVnIJSNsMg6TxKjU466yI5JKgjEGP9qx4K4j29Rp8cWii0kVfR7YzWx26vD1w/Kg3jnm+bcoBFuzmV757DmX9Sfpy8cBQT4Tm/Vt2P8TkwAr65gqxSfuAmeAuTlNZ81lBFGUfbQ0yvUgzJeWZ15S/+zuZbknoABfkFnuOjiJtJM/8ZGT0fU92mCILkz0Wx9gnGAriNGS5V1wStnv4kqwTGOZ3d9aCyXhohaMyjDCYO7kUva7fPrrz/KrtBJhFlLz1kN5txuAKsfwy6AJgW5cVR7BhC84ViEyzgwUzQkGMooVnTXJ3sLy9Qshz6BH/qT1vNrxfX8T 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, 20 Feb 2023 13:52:25 -0800 Andrew Morton wrote: > There are a lot of conflicts in your future, mainly because of the > ongoing folio conversion work. This will hopefully come to an end > fairly soon. Forthcoming conflicts which are known about, along with > Stephen's fixes are: > ... And... I failed to mention a conflict which didn't generate a reject, thanks to a post-6.2-rc4 gfs2 patch. Stephen's fix for this is at https://lkml.kernel.org/r/20230127173638.1efbe423@canb.auug.org.au Or, From: Andrew Morton Subject: fs/gfs2/log.c: fix build in __gfs2_writepage() Date: Tue Feb 21 03:23:08 PM PST 2023 mm-stable was based on 6.2-rc4 and hence its patch d585bdbeb79a ("fs: convert writepage_t callback to pass a folio") didn't know about the post-rc4 95ecbd0f162f ("Revert "gfs2: stop using generic_writepages in gfs2_ail1_start_one""). Net result is that d585bdbeb79a failed to convert fs/gfs2/log.c. The fix is from Andreas. Fixes: d585bdbeb79a ("fs: convert writepage_t callback to pass a folio") Reported-by: Andreas Gruenbacher Link: https://lkml.kernel.org/r/20230203105401.3362277-1-agruenba@redhat.com Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- --- a/fs/gfs2/log.c~fs-gfs2-logc-fix-build-in-__gfs2_writepage +++ a/fs/gfs2/log.c @@ -80,11 +80,11 @@ void gfs2_remove_from_ail(struct gfs2_bu brelse(bd->bd_bh); } -static int __gfs2_writepage(struct page *page, struct writeback_control *wbc, - void *data) +static int __gfs2_writepage(struct folio *folio, struct writeback_control *wbc, + void *data) { struct address_space *mapping = data; - int ret = mapping->a_ops->writepage(page, wbc); + int ret = mapping->a_ops->writepage(&folio->page, wbc); mapping_set_error(mapping, ret); return ret; } _