From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbbBRRjN (ORCPT ); Wed, 18 Feb 2015 12:39:13 -0500 Received: from mail-we0-f182.google.com ([74.125.82.182]:40060 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752728AbbBRRi4 (ORCPT ); Wed, 18 Feb 2015 12:38:56 -0500 Date: Wed, 18 Feb 2015 18:38:51 +0100 From: Ingo Molnar To: Heinrich Schuchardt Cc: Jonathan Corbet , Ingo Molnar , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Michael Kerrisk Subject: Re: [PATCH 1/1] Documentation/robust-futex-API: remove alternative language Message-ID: <20150218173851.GA31566@gmail.com> References: <1424098577-5492-1-git-send-email-xypron.glpk@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424098577-5492-1-git-send-email-xypron.glpk@gmx.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Heinrich Schuchardt wrote: > The man-pages as well as robust-futexes.txt use the word > "contend" for a situation where two threads try to access > the same futex at the same time. > > To avoid confusion robust-futex-API.txt should not use > "contest" as alternative language. > > Signed-off-by: Heinrich Schuchardt > --- > Documentation/robust-futex-ABI.txt | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/robust-futex-ABI.txt b/Documentation/robust-futex-ABI.txt > index 16eb314..e6a5532 100644 > --- a/Documentation/robust-futex-ABI.txt > +++ b/Documentation/robust-futex-ABI.txt > @@ -18,8 +18,8 @@ required for futexes is: > by the exiting thread. > > The existing normal futexes already provide a "Fast Userspace Locking" > -mechanism, which handles uncontested locking without needing a system > -call, and handles contested locking by maintaining a list of waiting > +mechanism, which handles uncontended locking without needing a system > +call, and handles contended locking by maintaining a list of waiting So this was a typo, not alternative language! :-) Acked-by: Ingo Molnar Thanks, Ingo