From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DF1F197A8E for ; Mon, 21 Jul 2025 21:35:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753133752; cv=none; b=fNktk8S/Yl7qsE2bJIAgwxUkyqbHUerUpDfXtkNUuPIaOEvYugyYRk71x+ltEo78rTsOG9Nna8pDbAE74NJsUM9zWK05yBvWRFECtUpRu5dHUd/rXYUeuTMFQ7B7PywbDwr622eflSwxgemgjNUIXh4QwgpvmKJg4ZwRVpcFamw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753133752; c=relaxed/simple; bh=pIHkg1PF7m+SsM+AvWBAOfUApbaih6tece88slv0vUE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=paz/5Nl7Heptt2vUaQMun/P3Wbuhla7BcMJiBUQn9o6lMfsMU1TXq23mLvrWdnUjFKviPrm3KL4+tVhGcsK7jF1S0aaSSyyOaf4Bz5nTyy+GvKQVS+PgAGTqbqaHkx/uEMJI7eiCEVIyNJt/kz7PQ03a/tNy8CtNOqHKd3F5JjA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gZD1/fgd; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gZD1/fgd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753133749; h=from:from: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; bh=WNZK/xPSiNdRHNiKZgH5YF3Zh3xZYyyJT1VvgerLxOo=; b=gZD1/fgd1NYxPe5I5TMyLKHAQK6NQAqOwh+tDH4mTPN8SfssmTuB/tOzT/bRH9PHviQVvD SjI9IxfsSsG9VyJ6R8El1uAc44Op3o2rUZ5pPkUcxXH/tbTF5f5KdPRSXZ75liu89Xrxs5 KpzVGyIAELhKKLTmyxxAKhHCPGORQxY= Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-kMh26WcQMqmr63AjFoRkPQ-1; Mon, 21 Jul 2025 17:35:47 -0400 X-MC-Unique: kMh26WcQMqmr63AjFoRkPQ-1 X-Mimecast-MFC-AGG-ID: kMh26WcQMqmr63AjFoRkPQ_1753133746 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-235c897d378so44726295ad.1 for ; Mon, 21 Jul 2025 14:35:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753133746; x=1753738546; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=WNZK/xPSiNdRHNiKZgH5YF3Zh3xZYyyJT1VvgerLxOo=; b=scpKoaJ9yBSVdCo4vxWdhA4Sr9KO+YbIda30KkQYcChS3MSKxqCSmGENBS4K+oi6kA vyWdG6epHdHNJ3ppmqcHAUvQcdR/kF0sVXeOOYrvEChN+lxLFpK1WNC4HBiScv2IjrnQ IxudL1Ao9YJdTR43lOISXlNOyrmycrKNM90ozpzGIF/Hk4blFsL4zCWKFytZunOqKXrr a5vD84/eOBbaWLmA48vRbIsyV2Gieb8ogrH7h53ZLsZSx+juHj4Kl0Kc1Lt3Eh8xoZkv 9DDykpjrYhnAoqIhG0Q4nCF2gMvZaOBwr2PupJpurEIuUhXfJDh5zLur42es6eBNLQ5L U7Ow== X-Forwarded-Encrypted: i=1; AJvYcCUy7iTRqa3TErmCoFPWyiCh2aBsmUQXcDapv+XqBuzZMsc+L8lmqYe/Vl7sTj8j5kdej+E8Mr5nR7oa4hU=@vger.kernel.org X-Gm-Message-State: AOJu0YysGSMae/MWElwLabY3r3myoerspVIUW2uwpM13NDdg2wFU4FNb JFjk5p+1whNZRbwjVDByjB3Kn16zCWJDVwkGlucJR8tVwdrj+T/GC2/Kgl1BFAoXBybikaE3UUy YYiiEiLRXGQcPe32w9TXkQI485pTxPdAQYciHjuQqgG9TYprvglSHhPcmVMgNwVoNig== X-Gm-Gg: ASbGnctAWMH42R3bqpo4wxa9QWotI1U8W91bNAwJnvdSTaaNcGBvF5qJBm00c5eR7+S SZDmf9KIG2toobPgAnEyMg3pBiGRLHCKzv+62JPtIUeUlNGqYpdNlOAUwAFVQCsOEz0mBO2qAnv C18SSIv+IdBsiz0jHh7fHUBvA8HclBd4ytTaO8Rhxy6ijpo4c49ULeJdGhZdGBNjEpGA49rvodD ix2OQQMAf1h9sq0rt0WPmZkAxZIRrRrWo3sA5hNxJOFLll9jRr6EHbZSSWM9LA2uXAfR9+iL/9X /QuavQO2C6tWJE6eCSnpdo1HkTYOlmNpG29XPC3iVtAaMn85a51An/iITUmfC+k/qVETOm1hhzl Sxpr4jo2+zSTgB3nqkNDoT7vP3zE= X-Received: by 2002:a17:902:c943:b0:234:bca7:292e with SMTP id d9443c01a7336-23e24edc25emr301841825ad.14.1753133746173; Mon, 21 Jul 2025 14:35:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmaPY5mypld4N9BcnGH03d5JyqrlB7F4HlS9rdNmADis0kNCJBZXkmGrCsg2jAEFmD4jbN6g== X-Received: by 2002:a17:902:c943:b0:234:bca7:292e with SMTP id d9443c01a7336-23e24edc25emr301841615ad.14.1753133745762; Mon, 21 Jul 2025 14:35:45 -0700 (PDT) Received: from [192.168.2.110] (bras-base-aylmpq0104w-grc-59-70-29-229-84.dsl.bell.ca. [70.29.229.84]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23e3b708244sm62593925ad.227.2025.07.21.14.35.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Jul 2025 14:35:45 -0700 (PDT) Message-ID: <954b5aa4-0dbd-445f-8859-320fb6a1186d@redhat.com> Date: Mon, 21 Jul 2025 17:35:42 -0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the slab tree with the mm-unstable tree To: Matthew Wilcox , Stephen Rothwell Cc: Vlastimil Babka , Andrew Morton , Linux Kernel Mailing List , Linux Next Mailing List , David Hildenbrand References: <20250721142001.3d1c8777@canb.auug.org.au> Content-Language: en-US, en-CA From: Luiz Capitulino In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025-07-21 15:38, Matthew Wilcox wrote: > On Mon, Jul 21, 2025 at 02:20:01PM +1000, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the slab tree got a conflict in: >> >> fs/proc/page.c >> >> between commit: >> >> a602ee331e31 ("fs: stable_page_flags(): use snapshot_page()") >> >> from the mm-unstable tree and commit: >> >> d8178294c53e ("proc: Remove mention of PG_slab") >> >> from the slab tree. >> >> I fixed it up (I just used the former version) and can carry the fix as >> necessary. This is now fixed as far as linux-next is concerned, but any > > I think the snapshot_page commit was incorrect in removing this comment. > It is still valuable information. I think the comment from d8178294c53e > should remain in the tree after the resolution. The comment wasn't just dropped, David suggested a new version for the comment (which is similar to yours). The new comment is now part of set_ps_flags() which is where we set this flag in the snapshot_page() implementation: static void set_ps_flags(struct page_snapshot *ps, const struct folio *folio, const struct page *page) { /* * Only the first page of a high-order buddy page has PageBuddy() set. * So we have to check manually whether this page is part of a high- * order buddy page. */ if (PageBuddy(page)) ps->flags |= PAGE_SNAPSHOT_PG_BUDDY; else if (page_count(page) == 0 && is_free_buddy_page(page)) ps->flags |= PAGE_SNAPSHOT_PG_BUDDY; if (folio_test_idle(folio)) ps->flags |= PAGE_SNAPSHOT_PG_IDLE; }