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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BEF1E9412F for ; Fri, 6 Oct 2023 21:47:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233823AbjJFVrf (ORCPT ); Fri, 6 Oct 2023 17:47:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233847AbjJFVrY (ORCPT ); Fri, 6 Oct 2023 17:47:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6038FC6 for ; Fri, 6 Oct 2023 14:47:23 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 915CEC433C8; Fri, 6 Oct 2023 21:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1696628843; bh=c/ZGoGInpMae4N0ku9UOyhNefSYDaPxVrCUSLmBUxXU=; h=Date:To:From:Subject:From; b=IHFDnlri0JKRKSGYG9gXYnU2D+PAzMS8/nLrjgCzF6gGHJkEppJ243xfxc0c6vTso hg45w09vSyfSmozdJUKgeOCK/PfOEfITHKnS3z5YV1wetTwQXu3Lea5Ks8sBUSxMEh kz/HkWXnd8LH15PxbKnRSQhim95cvKMp/pbR1evA= Date: Fri, 06 Oct 2023 14:47:20 -0700 To: mm-commits@vger.kernel.org, ying.huang@intel.com, rafael@kernel.org, lenb@kernel.org, aneesh.kumar@linux.ibm.com, lizhijian@cn.fujitsu.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] acpimm-fix-typo-sibiling-sibling.patch removed from -mm tree Message-Id: <20231006214722.915CEC433C8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: acpi,mm: fix typo sibiling -> sibling has been removed from the -mm tree. Its filename was acpimm-fix-typo-sibiling-sibling.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Li Zhijian Subject: acpi,mm: fix typo sibiling -> sibling Date: Wed, 2 Aug 2023 17:28:56 +0800 First found this typo as reviewing memory tier code. Fix it by sed like: $ sed -i 's/sibiling/sibling/g' $(git grep -l sibiling) so the acpi one will be corrected as well. Link: https://lkml.kernel.org/r/20230802092856.819328-1-lizhijian@cn.fujitsu.com Signed-off-by: Li Zhijian Cc: Aneesh Kumar K.V Cc: Huang, Ying Cc: Len Brown Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton --- drivers/acpi/acpi_pad.c | 2 +- include/linux/memory-tiers.h | 2 +- mm/memory-tiers.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) --- a/drivers/acpi/acpi_pad.c~acpimm-fix-typo-sibiling-sibling +++ a/drivers/acpi/acpi_pad.c @@ -100,7 +100,7 @@ static void round_robin_cpu(unsigned int for_each_cpu(cpu, pad_busy_cpus) cpumask_or(tmp, tmp, topology_sibling_cpumask(cpu)); cpumask_andnot(tmp, cpu_online_mask, tmp); - /* avoid HT sibilings if possible */ + /* avoid HT siblings if possible */ if (cpumask_empty(tmp)) cpumask_andnot(tmp, cpu_online_mask, pad_busy_cpus); if (cpumask_empty(tmp)) { --- a/include/linux/memory-tiers.h~acpimm-fix-typo-sibiling-sibling +++ a/include/linux/memory-tiers.h @@ -22,7 +22,7 @@ struct memory_tier; struct memory_dev_type { /* list of memory types that are part of same tier as this type */ - struct list_head tier_sibiling; + struct list_head tier_sibling; /* abstract distance for this specific memory type */ int adistance; /* Nodes of same abstract distance */ --- a/mm/memory-tiers.c~acpimm-fix-typo-sibiling-sibling +++ a/mm/memory-tiers.c @@ -115,7 +115,7 @@ static __always_inline nodemask_t get_me nodemask_t nodes = NODE_MASK_NONE; struct memory_dev_type *memtype; - list_for_each_entry(memtype, &memtier->memory_types, tier_sibiling) + list_for_each_entry(memtype, &memtier->memory_types, tier_sibling) nodes_or(nodes, nodes, memtype->nodes); return nodes; @@ -174,7 +174,7 @@ static struct memory_tier *find_create_m * If the memtype is already part of a memory tier, * just return that. */ - if (!list_empty(&memtype->tier_sibiling)) { + if (!list_empty(&memtype->tier_sibling)) { list_for_each_entry(memtier, &memory_tiers, list) { if (adistance == memtier->adistance_start) return memtier; @@ -218,7 +218,7 @@ static struct memory_tier *find_create_m memtier = new_memtier; link_memtype: - list_add(&memtype->tier_sibiling, &memtier->memory_types); + list_add(&memtype->tier_sibling, &memtier->memory_types); return memtier; } @@ -527,7 +527,7 @@ static bool clear_node_memory_tier(int n memtype = node_memory_types[node].memtype; node_clear(node, memtype->nodes); if (nodes_empty(memtype->nodes)) { - list_del_init(&memtype->tier_sibiling); + list_del_init(&memtype->tier_sibling); if (list_empty(&memtier->memory_types)) destroy_memory_tier(memtier); } @@ -553,7 +553,7 @@ struct memory_dev_type *alloc_memory_typ return ERR_PTR(-ENOMEM); memtype->adistance = adistance; - INIT_LIST_HEAD(&memtype->tier_sibiling); + INIT_LIST_HEAD(&memtype->tier_sibling); memtype->nodes = NODE_MASK_NONE; kref_init(&memtype->kref); return memtype; _ Patches currently in -mm which might be from lizhijian@cn.fujitsu.com are