From nobody Fri Oct 29 17:27:54 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 59ACA182F845; Fri, 29 Oct 2021 17:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HgqBg4Vhpz4gZK; Fri, 29 Oct 2021 17:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 338F11AEB5; Fri, 29 Oct 2021 17:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19THRt8J083487; Fri, 29 Oct 2021 17:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19THRsBj083486; Fri, 29 Oct 2021 17:27:54 GMT (envelope-from git) Date: Fri, 29 Oct 2021 17:27:54 GMT Message-Id: <202110291727.19THRsBj083486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Houchard Subject: git: 74e9b5f29ad0 - main - Merge commit 'ce929fe84f9c453263af379f3b255ff8eca01d48' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cognet X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74e9b5f29ad0056bbe11a30c91dfa0705fa19cd5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=74e9b5f29ad0056bbe11a30c91dfa0705fa19cd5 commit 74e9b5f29ad0056bbe11a30c91dfa0705fa19cd5 Merge: ad0379660d0c ce929fe84f9c Author: Olivier Houchard AuthorDate: 2021-10-29 17:18:03 +0000 Commit: Olivier Houchard CommitDate: 2021-10-29 17:18:03 +0000 Merge commit 'ce929fe84f9c453263af379f3b255ff8eca01d48' Import CK as of commit 2265c7846f4ce667f5216456afe2779b23c3e5f7. sys/contrib/ck/include/ck_backoff.h | 2 +- sys/contrib/ck/include/ck_cc.h | 2 + sys/contrib/ck/include/ck_ec.h | 945 ++++++++++++++++++++++++ sys/contrib/ck/include/ck_fifo.h | 2 +- sys/contrib/ck/include/ck_hs.h | 8 + sys/contrib/ck/include/ck_pr.h | 15 +- sys/contrib/ck/include/ck_queue.h | 20 +- sys/contrib/ck/include/ck_ring.h | 672 +++++++++++++---- sys/contrib/ck/include/gcc/aarch64/ck_pr.h | 12 +- sys/contrib/ck/include/gcc/aarch64/ck_pr_llsc.h | 106 +-- sys/contrib/ck/include/gcc/aarch64/ck_pr_lse.h | 37 +- sys/contrib/ck/include/gcc/ck_cc.h | 9 + sys/contrib/ck/include/gcc/x86/ck_pr.h | 109 +-- sys/contrib/ck/include/gcc/x86_64/ck_pr.h | 87 ++- sys/contrib/ck/include/spinlock/fas.h | 9 +- sys/contrib/ck/src/ck_ec.c | 425 +++++++++++ sys/contrib/ck/src/ck_ec_timeutil.h | 150 ++++ sys/contrib/ck/src/ck_hs.c | 7 +- sys/contrib/ck/src/ck_ht.c | 3 - 19 files changed, 2272 insertions(+), 348 deletions(-) diff --cc sys/contrib/ck/include/ck_ec.h index 000000000000,cd2a36813a79..cd2a36813a79 mode 000000,100644..100644 --- a/sys/contrib/ck/include/ck_ec.h +++ b/sys/contrib/ck/include/ck_ec.h diff --cc sys/contrib/ck/src/ck_ec.c index 000000000000,9b24e762947c..9b24e762947c mode 000000,100644..100644 --- a/sys/contrib/ck/src/ck_ec.c +++ b/sys/contrib/ck/src/ck_ec.c diff --cc sys/contrib/ck/src/ck_ec_timeutil.h index 000000000000,50cfb67bf4a4..50cfb67bf4a4 mode 000000,100644..100644 --- a/sys/contrib/ck/src/ck_ec_timeutil.h +++ b/sys/contrib/ck/src/ck_ec_timeutil.h