Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp1655300pxa; Thu, 13 Aug 2020 13:51:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpmrZUi3vKqrl/rgqoVNnz06R6y8k8BgozmNsyM1rPFpgQD+EUjC8S1i4KhCea3KlgGP3N X-Received: by 2002:a17:906:7798:: with SMTP id s24mr6499483ejm.45.1597351865675; Thu, 13 Aug 2020 13:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597351865; cv=none; d=google.com; s=arc-20160816; b=LpMzRQx7SeWAu3o3dNNk2twVDPaMtzEBAIjUXuYHtFf2THYFgUHNmQ4s7L7z7Ze08N DaIlIo5Kgje8TAR6n+VqfvwSVywTOgVEx1JzqdMXD9GaRehEOy83Fjxn00TXyS2cB1J7 phy4+7gYngPWPetcZ/RAsL5JofXdHdUX9rqqQQTEqyylVlQ699Dp7LGHAy3SuqpKVTbu aoa5oF4sZnhfWLFzmcxj5UPrOZ0XACPO+qQcbHJovLuiFuyqt8vcSDmCwtqVggaqImNF Z2fMbF1EgI58Y44u4faPOocmznp3ChpJlIYFFdSAFiI9gQxCUb2CpPq74IqrOmWHmgx+ m3hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=nWGVZ3Mpr3AqRCpLX8dy3EPmnqq4O3gEfxHcMXgcFMY=; b=aAKEM1zNpFevasQji8eu72ZhgoAZH5TIA0NEVB5odGMPgtF3vXkT8f7Z+em44kPteB Oo4mgKot17xlRXgrFqRmuznQYG+swVcTos94ozR6eTuiyTJv1+vXeGPQfyiK1xAW4xud 6xjAsu9YizbcFRZIlExOj5fv3Fo4dzANHXAQYGkJCYmN3gGQYwZXHMQTd4agGttz6q8x Hgv/DfDZVa+7RMUhzMI3Y9SbIh9gaFCj7HwC2t5qXhphjVBiBFUCnjXZmfMrrtfpmuok govFgxzWKt0fKgNcadBSBBZnacOICW9f7uVc3D3Uj2hmkMWqqDA/VhlzgJ+lXC7gt+I8 IWJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=tlw5RoRj; dkim=neutral (no key) header.i=@linutronix.de header.b=9APNVVop; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a18si4401017ejr.616.2020.08.13.13.50.43; Thu, 13 Aug 2020 13:51:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=tlw5RoRj; dkim=neutral (no key) header.i=@linutronix.de header.b=9APNVVop; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726642AbgHMUuF (ORCPT + 99 others); Thu, 13 Aug 2020 16:50:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726623AbgHMUuD (ORCPT ); Thu, 13 Aug 2020 16:50:03 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 507DFC061757; Thu, 13 Aug 2020 13:50:03 -0700 (PDT) Date: Thu, 13 Aug 2020 20:50:00 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1597351801; h=from:from:sender:sender:reply-to: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=nWGVZ3Mpr3AqRCpLX8dy3EPmnqq4O3gEfxHcMXgcFMY=; b=tlw5RoRj1/2TbwxvnaEIRfrpr24lIM3If3j9YPT3FSTIu8gFn2n0NRnWpvDV5zecja5u1W KksyJtZzplLK7IPcdloH3SjgD2OSFJn66oYxmWRhhkU2aD5AhY2XYc/7pHvE+1TSv5CmYx co5IfbkvkATUx6TA0yACT+SWclHQ6kaRBah8oZKyxeozpTleCFpxbD0bTam5Ejqy7eDa39 mDc2Ndhgs8hJsxveT9jWq8zB4vIa76lcApbw3ycswgnzKYY9FnHolMI+7Hw5o3iDP2PYfG arttBDbZFsrOybxYqCyk3HJawEHemWfBZsSUllLA/Pk45SmOc09QaGwpNVNqhg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1597351801; h=from:from:sender:sender:reply-to: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=nWGVZ3Mpr3AqRCpLX8dy3EPmnqq4O3gEfxHcMXgcFMY=; b=9APNVVop/JOjBjiYCTPpYuNMvv79WCGUcCto6+h9nf4lvAQf7dwUjlea7qsSs6rQmgxRDk SH4Bj2Y34XavqEAQ== From: "tip-bot2 for Huang Shijie" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/urgent] Documentation/locking/locktypes: Fix a typo Cc: Huang Shijie , Ingo Molnar , Will Deacon , x86 , LKML In-Reply-To: <20200813060220.18199-1-sjhuang@iluvatar.ai> References: <20200813060220.18199-1-sjhuang@iluvatar.ai> MIME-Version: 1.0 Message-ID: <159735180052.3192.8696596314516068127.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/urgent branch of tip: Commit-ID: cb75c95c5262328bd4da3dd334f6826a3a34a979 Gitweb: https://git.kernel.org/tip/cb75c95c5262328bd4da3dd334f6826a3a34a979 Author: Huang Shijie AuthorDate: Thu, 13 Aug 2020 14:02:20 +08:00 Committer: Ingo Molnar CommitterDate: Thu, 13 Aug 2020 20:59:06 +02:00 Documentation/locking/locktypes: Fix a typo We have three categories locks, not two. Signed-off-by: Huang Shijie Signed-off-by: Ingo Molnar Acked-by: Will Deacon Link: https://lore.kernel.org/r/20200813060220.18199-1-sjhuang@iluvatar.ai --- Documentation/locking/locktypes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/locking/locktypes.rst b/Documentation/locking/locktypes.rst index 1b577a8..4cefed8 100644 --- a/Documentation/locking/locktypes.rst +++ b/Documentation/locking/locktypes.rst @@ -10,7 +10,7 @@ Introduction ============ The kernel provides a variety of locking primitives which can be divided -into two categories: +into three categories: - Sleeping locks - CPU local locks