From nobody Sat Mar 14 04:05:47 2026 X-Original-To: dev-commits-src-main@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 4fXnp36RB9z6V6M3 for ; Sat, 14 Mar 2026 04:05: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXnp35qP6z3F9h for ; Sat, 14 Mar 2026 04:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773461147; 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=XIiYdRAVt6EaskVHkhXFv14HAT6RRpEFXRiMFc7idiw=; b=hGt6Z4JkhuVeuX4QviLoA6TllJkFJRCEq7y9l8S9zpcGLrnjs2jgoSNh1RU5PxwABSGLTs pCOKPdQwqZKzuDJecU0OjJI83oxw6wt/9m4SjdcVf/KdztC27TP6svvTyb3iJHO3UWZvAj p1gf1dDC3RWUgW738vDtHtGDoNkhXYDfjGXkOHQAWoI7cpxc0BFGqn4R/wOKMW05NlXq8l x9rqfwXX1veLbMCowY/bBFiGd/nCkKQqZn9LFBxb80Q1L905taAqOe0M75TZs2xBY5l5bf 3CBDjr8Z9j2FqZipso/w8eeyHUwYPyfUXIvNVvMtO0ItkzSLWej2CmvwjIY+0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773461147; a=rsa-sha256; cv=none; b=UFGUaxtFmIDNUvTisiF37Ry05/MmRzw9Rcmdto/R1zvb0LxXfrNdYG1jWTcFvYp9OfQo/H JcusfPwWk0bikY9MRF5UJhG/EBfO805n6DI742g/J/LbY9P4G7+yKXiBdkI6CJGgc528lt T84x5B6GRas4tW/pd90AU6Z2AONIFiQd6kJMOYMMweoflqcEXGI87F1MDHifpgKT+3D9li WVuJebZaeFBXb5aSjApaXV/HB7oQtkw9MR6XwBnwZFb0tYv9W81aHrv5l/P8T8cxJMdeoQ MjojQeSA7rxUmFKiEWY3y4YU8idSOkN79WgSo+oxtVhokAhtBmfGmXoRqJsp9w== 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=1773461147; 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=XIiYdRAVt6EaskVHkhXFv14HAT6RRpEFXRiMFc7idiw=; b=LoUGouAIM4YTv+CIf9UFwJFZ47whqryvpft67URl0d1gxaB6Je3Hn5qihhXX5ybst1ytx0 Od8k9lds4IaLooQE6vZAyyTDb4gDUxkNHClUjRz9dMU4XdgcBNdiS/M349WwdS43jArYEM TFPhDOLupWwp2Hm29ZBfuwDcq6eMK8qSRZsb6EhlXdCHbk6BsvZHjD1LBrADD5mDTrIRKx 6uCGPXepqjDZ/zk4Enz9OH7ViGL++VDW0XRjJ8/MBRuIkaKxVpwtbozKmSb110wShfkaEF bxRBcuPpbd/+MiHeczbnwa8HCl6vJ9vbCHbZ0SB4pYNZmjREH9PSMmsx7iQfbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXnp35QWTz12dF for ; Sat, 14 Mar 2026 04:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43cf6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Mar 2026 04:05:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a47c870930a7 - main - inpcb: fix up !VIMAGE builds List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a47c870930a728b5d890e8243cc363c788ebddc7 Auto-Submitted: auto-generated Date: Sat, 14 Mar 2026 04:05:47 +0000 Message-Id: <69b4de9b.43cf6.575e45dc@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a47c870930a728b5d890e8243cc363c788ebddc7 commit a47c870930a728b5d890e8243cc363c788ebddc7 Author: Gleb Smirnoff AuthorDate: 2026-03-14 03:59:51 +0000 Commit: Gleb Smirnoff CommitDate: 2026-03-14 03:59:51 +0000 inpcb: fix up !VIMAGE builds There are some files that don't include mutex.h and rwlock.h, but use inpcb locking macros. With VIMAGE the net/vnet.h pulls half of the possible kernel includes, masking the problem. The in_pcb.h also used to mask the problem, so restore that. Fixes: 041e9eb1ae094a81e55fbcaba37eb2ac194658cc --- sys/netinet/in_pcb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index bdf8ff9fb74c..6f842f64775e 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -292,9 +292,9 @@ struct xktls_session { */ #include #include -#include -#include -#include +#include +#include +#include #include #include #include