From nobody Wed Jul 31 18:27:47 2024 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 4WZ0vR2rYjz5SLPW; Wed, 31 Jul 2024 18:27:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZ0vR2FQ4z4Ndd; Wed, 31 Jul 2024 18:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722450467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1rSxKuQKFq/PKMGNThZ0QAukq9XA2EqUNy4HemsLhk=; b=xYo5xV+AsQV4hOIGgClivGqxcrfcEyNxFUNHUcVQogHH4HvqQImgE4SN4oVrEw5GR77xhL nALj6t6+9k7G99C531cXbBaHCHm69aMQbUoZXa/X6T6uG0xCTSWo0Y+P91erh1aEkgWPWR p+PMWCaggzKwWi5EFtBjfE7E7X2JoCEhojAYAe9aIcLL26AWWOcGaKljcF2kfT+ZDc4hOI lnPkdFUYNLt72CZZse1CNLrZDK8gX/b1ddZEh6zPa63gqoORLk/K9EKVmoHXGac8lkQzrV nAsgOOgvSBMhKy0AJNRuP36/8QmS2+Z+GCEh7ElxqPel8UU+x7jov8JdPdcH2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722450467; a=rsa-sha256; cv=none; b=dac0vleGGAOSGVP8P8pk6+V1aU1CX8UugXwrZesA0vcqRrut4hjLA2KNcb9zHIsKorRdPi sZiw82O9XCvWTh+ghFWeMDxGHKReX5ky0sWlzEM6OzELaNhX7b/brxS+0eOHyLV+ijty+9 aj6Hm4s7lp7kq922uijCZYLxfT0MLuURLba6w091NH4Stfg8+mrMoGsUd+eDwOJbELPMEf Zy6Hbuy7No6BFhHQu3Y9iVWC7IuSBuHN+fBJ0GmwW7cJB+srSvXCF5y98ZdKdTbkl+cJjY RWAjPNJpfsXTI1AVmEpduHCWTkowQc+dezz0fpxrUXjLPmj4aUPKlRo70Z4WvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722450467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q1rSxKuQKFq/PKMGNThZ0QAukq9XA2EqUNy4HemsLhk=; b=auQO15pzUBBag3GkL6Blgct0SZ70oPeZqv5sYn0hR+30Ef0eYuC/iZQjNkm+NSp5M+mgEO dqhPXhXcQXLdrSSIy7mGO2R3AlB4rCOTZR4D86DAveGIiUXleIS1ME6X08w6YFaOt5BiPR UF1avNujnAHMTEfZgsQf5yZ+c1E2zpxKu+M8+sQ92UYJ8sr4MQ3yXvCw9iiD8KJU4YU9HN nMScxXE0VH/lm0a5dMjzo26wySJZcGc9O5308vq6g7BPLGvE0HvulOvFOnYfVanUjgWHvC QWAfV7nGBwPaNAvFQXi0nqq8Wdzt5lwQaClHw+YzkkUd53sqUCe27PYs36mOyg== 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 4WZ0vR1rnGz19PY; Wed, 31 Jul 2024 18:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46VIRl0n075003; Wed, 31 Jul 2024 18:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46VIRlZo075000; Wed, 31 Jul 2024 18:27:47 GMT (envelope-from git) Date: Wed, 31 Jul 2024 18:27:47 GMT Message-Id: <202407311827.46VIRlZo075000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michal Meloun Subject: git: fb084dd01e25 - stable/14 - Fix mismerge in lib/libthr/arch/riscv/include/pthread_md.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fb084dd01e25b7fa743e55dac40a0af29b6ea14d Auto-Submitted: auto-generated The branch stable/14 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=fb084dd01e25b7fa743e55dac40a0af29b6ea14d commit fb084dd01e25b7fa743e55dac40a0af29b6ea14d Author: Michal Meloun AuthorDate: 2024-07-31 18:19:38 +0000 Commit: Michal Meloun CommitDate: 2024-07-31 18:27:05 +0000 Fix mismerge in lib/libthr/arch/riscv/include/pthread_md.h Fixes: bd774d7aa1117f531b2894a6428aa2792f7bedc8 --- lib/libthr/arch/riscv/include/pthread_md.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libthr/arch/riscv/include/pthread_md.h b/lib/libthr/arch/riscv/include/pthread_md.h index 2f70aa5edf25..baddfe3ecb22 100644 --- a/lib/libthr/arch/riscv/include/pthread_md.h +++ b/lib/libthr/arch/riscv/include/pthread_md.h @@ -61,9 +61,4 @@ _thr_resolve_machdep(void) { } -static __inline void -_thr_resolve_machdep(void) -{ -} - #endif /* _PTHREAD_MD_H_ */