From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fw@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2178)
 id 710983939C01; Mon,  3 May 2021 12:17:47 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 710983939C01
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] nptl: Re-sort Versions file
X-Act-Checkin: glibc
X-Git-Author: Florian Weimer <fweimer@redhat.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: cf2c57526ba4b57e6863ad4db8a868e2678adce8
X-Git-Newrev: dde76856ba6bf8b374f616bb835f211d3f1ec6ef
Message-Id: <20210503121747.710983939C01@sourceware.org>
Date: Mon,  3 May 2021 12:17:47 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2021 12:17:47 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dde76856ba6bf8b374f616bb835f211d3f1ec6ef

commit dde76856ba6bf8b374f616bb835f211d3f1ec6ef
Author: Florian Weimer <fweimer@redhat.com>
Date:   Mon May 3 14:12:55 2021 +0200

    nptl: Re-sort Versions file
    
    Due to an incorrect conflict resolution, libc/GLIBC_2.2 section was no
    longer sorted lexicographically.

Diff:
---
 nptl/Versions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nptl/Versions b/nptl/Versions
index 008a344f0d..0914630be3 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -93,13 +93,13 @@ libc {
     pthread_mutex_timedlock;
     pthread_mutexattr_getpshared;
     pthread_mutexattr_setpshared;
+    pthread_rwlock_timedrdlock;
+    pthread_rwlock_timedwrlock;
     pthread_spin_destroy;
     pthread_spin_init;
     pthread_spin_lock;
     pthread_spin_trylock;
     pthread_spin_unlock;
-    pthread_rwlock_timedrdlock;
-    pthread_rwlock_timedwrlock;
     pthread_yield;
   }
   GLIBC_2.2.3 {