From nobody Tue Nov 28 08:40:45 2023
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 4SfbWd2nsYz52Nft;
	Tue, 28 Nov 2023 08:40:45 +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 4SfbWd27wmz3KB4;
	Tue, 28 Nov 2023 08:40:45 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1701160845;
	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=4QJ/u4cO0ygZJvrfM0XEcFl103cXTw4xqUHVulXvSvY=;
	b=buShfGUjudER7niouvIFslg+HIjH+cF4XbnByN068qoNCb9WHyxlonThHerVjb05Gbm0kc
	WvnyvWSBKRYeJiUkaz/H8yiqAU0H9KJJfsSkzJYO5QDhHY1wQdCtYH9fAFN00u5n9Y2VZb
	ZGO5bzY9VS26GdKh2OiDAFqiKfVtKCBMVylXibWxN/RREw3rPmbkjZSvySMysqPzCYDvbj
	bILTXQGskLi6esfdopn6tVjQs/KTx8CykdDN1g3NEpY/0pFesoDYESgll/5cqDkq4lhzdy
	OU8YrLQxRf/r5uyXkWGh2YmlWCBxzG2BCdT6pgY0U+4V9Cdgx4OxgA063YWuug==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1701160845;
	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=4QJ/u4cO0ygZJvrfM0XEcFl103cXTw4xqUHVulXvSvY=;
	b=r90tp0072Fdxazzrp9GZ3E2CzSnTXODM/ArSN+It7cX/oxK6Ue8c+C7d7VvPO5bcy+tKuQ
	cSRPsD1f4Ex4Y5HoQLH7hYEsbm+yEzx4cERvilJf8hi1q11wM7CyUE3PqWopi74alRz8P6
	3k1tf8ts9WHrMsMpqegbyPBEm5TnljhWxje1WpawE5VD2Xjl9eZ4N2AXLsZShDxcXRWdkP
	6EBcEml/LGGiaRmL9S4mTMqfKHuiD/1Qo1k2IshAEUGgz2dsy98jHEQYyrU6fp7vfmhRGF
	455g7/NdJG1V/MTB1PsBk/8EP3OGpL/wzzBsJwP4VWAeE/9+5aLQaqvpVe3HcA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701160845; a=rsa-sha256; cv=none;
	b=j67Rh9av+gIwQXQ0D4dZuEO58Vmaib68gO0jMSI6wzOUZRgwq7eXduESwVlUC5h3xR/3Bo
	N/7FP/8PawgyZpZVojxb6qa25l82jiLjG09k/m7BNb8YZZZXozSXXqjlzWhIcsPPzany0k
	k9kDEkqiaIGCBw6BUJH455EZiSAKtafgvUTtuXbWAC2GIN00Il//C9WuAj4UFQrGsF8rjR
	azFOUR9SaiT9WYAykNq6Y3d0KCQnABPtVIV7ndl3fjMrPaPCqmdm8PV1UNfqCCyaWEijKy
	pDvDQuuyuFXtJ1/VdpwTgXpX4BLd8gYZZcdcKTeyxD/JZ5g+xIRWRwacG/yVGA==
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 4SfbWd1FzDzkV;
	Tue, 28 Nov 2023 08:40:45 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AS8ejqL030323;
	Tue, 28 Nov 2023 08:40:45 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS8ejuX030319;
	Tue, 28 Nov 2023 08:40:45 GMT
	(envelope-from git)
Date: Tue, 28 Nov 2023 08:40:45 GMT
Message-Id: <202311280840.3AS8ejuX030319@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: Emmanuel Vadot <manu@FreeBSD.org>
Subject: git: 1148518afe43 - main - Revert "sys/mutex.h: Include
  sys/lock.h instead of sys/_lock.h"
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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: manu
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 1148518afe434d590c3a66aceb04ce509fe14708
Auto-Submitted: auto-generated

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=1148518afe434d590c3a66aceb04ce509fe14708

commit 1148518afe434d590c3a66aceb04ce509fe14708
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2023-11-28 08:39:59 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-11-28 08:39:59 +0000

    Revert "sys/mutex.h: Include sys/lock.h instead of sys/_lock.h"
    
    This reverts commit 2a35f3cdf63d1f9b1ea5ab0174adabb631757210.
    
    Doesn't appears to be needed anymore and if it is at some point I'll
    fix the driver.
---
 sys/sys/mutex.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 750a5e99679a..56c03a1b0be9 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -34,8 +34,8 @@
 #define _SYS_MUTEX_H_
 
 #include <sys/queue.h>
+#include <sys/_lock.h>
 #include <sys/_mutex.h>
-#include <sys/lock.h>
 
 #ifdef _KERNEL
 #include <sys/pcpu.h>