From nobody Mon Jan 5 20:09:26 2026 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 4dlQPM0sMYz6N0D1 for ; Mon, 05 Jan 2026 20:09:27 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlQPL45XWz3QlK for ; Mon, 05 Jan 2026 20:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643766; 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=Pl8ull0LZLPOzKddMSes8185iAF0EvFx/W3aOm1hrhM=; b=KqjJtjntlnczyikfdGxK5i9zCf1dNxWUIvzpK898QnufiS2pwarbLGXimCwBWtHjrVNpHQ EVXZEV77WiRt4tU3ctZKOROtpJ8vigANEWYq6H7eoXQrH7KLtiKc71fjxfoajbwCK8IpfE pzv1ij4defuR0nWm10WenQTXy8Y1PtZBIR+YrqGgoIdSY/J6NGxyRwntsGMQ0YpgsRrsFI HUpkjocTW/XoyeSEMCZbfqOx4/YRGDzXtgMoRPXoaYklmxNqHFkri0WnGid+DMu1/Qjr6g xfg3PMSHeHfeOUGwAu/Ip9Qq5CXaS2BbNmFIVzuzbK7KXUUS2lzRvNMLWBm3Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767643766; 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=Pl8ull0LZLPOzKddMSes8185iAF0EvFx/W3aOm1hrhM=; b=D6rHlLvu10w2VAxv55rv8XU/dN5fateztTRZtlMjq+fOn4Y5vnHXW9sL1n1+nocLiXT1B1 L2IfGWQvcxIBRuPk3wmbYzXVrzpPz99On1qYdgDGk39wdEozJkYgfkMGWvQyTwwB78jpPx tiB5u3Yn+NqukHqThgOeAZ5CA+2zMA5SfskHIfD5TcmO/xFo4SicisfUXcVkVz5r8mBtnx KkCv66LJ4N1b7Rv8Fpak8V3gm5xtRBcsSVZrSjq1c2NXcP7LE7IMUVs1zHL3lm3cYYq3Qu 4GDg62msr6B54vi/l0KaWOCre74BV2DHcU2EqW1bInOkVzcAD/AvpNmxIZx//Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767643766; a=rsa-sha256; cv=none; b=YUIuQ0N+5SJ2f0kBViYurD9Vnmu6ThAp4dt5Z13QmoODBVGi3cquzUnyRlnAcmUVnAYiA7 IRom6StAaF8SLng8H8FFLMkhybr0K80sWvkgxZOhoPqQ6OxUHSyUt29kjujnQTgxnAQe4U 9kaXXqhz8t3rArAcCtCaQJ4AOCTLA6s5zfS3RIgaS75PRAVF96CgIRdg5KhsOJn/iQVoId kAc389YSGK7Evidtn8MPFiHCqcqiqOZduhiXDE8SDOcYlBEKBnQT1w34YD54Z7LNBsu6NP 5+aIlrVu14Me1ibI/PZa9GXl/VqiD3cAw50o15L+UlMmMl5ML9QJs0tx8dW3lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dlQPL38f1zbjG for ; Mon, 05 Jan 2026 20:09:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 830d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 20:09:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: b5f7a0b0fd89 - main - linuxkpi: Replicate Linux #includes between headers 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5f7a0b0fd8953c00b154d96b79ba0208c2e1aca Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 20:09:26 +0000 Message-Id: <695c1a76.830d.2a25df04@gitrepo.freebsd.org> The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=b5f7a0b0fd8953c00b154d96b79ba0208c2e1aca commit b5f7a0b0fd8953c00b154d96b79ba0208c2e1aca Author: Jean-Sébastien Pédron AuthorDate: 2025-08-17 11:17:49 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-01-05 19:32:49 +0000 linuxkpi: Replicate Linux #includes between headers The DRM drivers (and probably other parts of the Linux kernel) had a significant cleanup w.r.t. which source file includes what in Linux 6.10. Nonetheless, the DRM drivers still depend on implicit namespace pollution because some source files do not include all the headers they should. This cleanup broke the build with FreeBSD because we do not replicate the same `#include` directives everywhere. This commit adds the same `#include` directives in several headers in order to get the same namespace pollution. This fixes the build of the DRM drivers from Linux 6.10. An example is `drm_dp_tunnel.c` which needed `str_yes_no()` defined by (technically in Linux). It gets it through: -> -> -> -> -> -> -> Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54496 --- sys/compat/linuxkpi/common/include/linux/cgroup.h | 9 +++++ sys/compat/linuxkpi/common/include/linux/file.h | 5 +++ sys/compat/linuxkpi/common/include/linux/i2c.h | 7 ++++ .../linuxkpi/common/include/linux/memcontrol.h | 43 ++++++++++++++++++++++ .../linuxkpi/common/include/linux/notifier.h | 5 +++ .../common/include/linux/regulator/consumer.h | 17 +++++++++ sys/compat/linuxkpi/common/include/linux/suspend.h | 6 +++ sys/compat/linuxkpi/common/include/linux/swap.h | 7 ++++ 8 files changed, 99 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/cgroup.h b/sys/compat/linuxkpi/common/include/linux/cgroup.h index a9dd22fd0f4c..c75404fd6cf3 100644 --- a/sys/compat/linuxkpi/common/include/linux/cgroup.h +++ b/sys/compat/linuxkpi/common/include/linux/cgroup.h @@ -29,6 +29,15 @@ #ifndef _LINUXKPI_LINUX_CGROUP_H_ #define _LINUXKPI_LINUX_CGROUP_H_ +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #endif /* _LINUXKPI_LINUX_CGROUP_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/file.h b/sys/compat/linuxkpi/common/include/linux/file.h index f6e988c2d88e..be12d5f1bccf 100644 --- a/sys/compat/linuxkpi/common/include/linux/file.h +++ b/sys/compat/linuxkpi/common/include/linux/file.h @@ -39,6 +39,11 @@ #include #include +#include +#include +#include +#include + struct linux_file; #undef file diff --git a/sys/compat/linuxkpi/common/include/linux/i2c.h b/sys/compat/linuxkpi/common/include/linux/i2c.h index f24d282586f6..a6a4ee85d584 100644 --- a/sys/compat/linuxkpi/common/include/linux/i2c.h +++ b/sys/compat/linuxkpi/common/include/linux/i2c.h @@ -31,7 +31,14 @@ #include #include +#include +#include #include +#include +#include +#include +#include +#include #define I2C_MAX_ADAPTER_NAME_LENGTH 32 diff --git a/sys/compat/linuxkpi/common/include/linux/memcontrol.h b/sys/compat/linuxkpi/common/include/linux/memcontrol.h new file mode 100644 index 000000000000..57fadf9af60f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/memcontrol.h @@ -0,0 +1,43 @@ +/*- + * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + +#ifndef _LINUXKPI_LINUX_MEMCONTROL_H_ +#define _LINUXKPI_LINUX_MEMCONTROL_H_ + +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* defined(_LINUXKPI_LINUX_MEMCONTROL_H_) */ diff --git a/sys/compat/linuxkpi/common/include/linux/notifier.h b/sys/compat/linuxkpi/common/include/linux/notifier.h index 9302a1ce4606..4fe43255c648 100644 --- a/sys/compat/linuxkpi/common/include/linux/notifier.h +++ b/sys/compat/linuxkpi/common/include/linux/notifier.h @@ -32,6 +32,11 @@ #include #include +#include +#include +#include +#include + #define NOTIFY_DONE 0 #define NOTIFY_OK 0x0001 #define NOTIFY_STOP_MASK 0x8000 diff --git a/sys/compat/linuxkpi/common/include/linux/regulator/consumer.h b/sys/compat/linuxkpi/common/include/linux/regulator/consumer.h new file mode 100644 index 000000000000..d6c23575bc83 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/regulator/consumer.h @@ -0,0 +1,17 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025-2026 The FreeBSD Foundation + * Copyright (c) 2025-2026 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + */ + +#ifndef _LINUXKPI_LINUX_REGULATOR_CONSUMER_H_ +#define _LINUXKPI_LINUX_REGULATOR_CONSUMER_H_ + +#include +#include + +#endif diff --git a/sys/compat/linuxkpi/common/include/linux/suspend.h b/sys/compat/linuxkpi/common/include/linux/suspend.h index dacecbebdc08..3d5d5d594127 100644 --- a/sys/compat/linuxkpi/common/include/linux/suspend.h +++ b/sys/compat/linuxkpi/common/include/linux/suspend.h @@ -3,6 +3,12 @@ #ifndef _LINUXKPI_LINUX_SUSPEND_H_ #define _LINUXKPI_LINUX_SUSPEND_H_ +#include +#include +#include +#include +#include + typedef int suspend_state_t; extern suspend_state_t pm_suspend_target_state; diff --git a/sys/compat/linuxkpi/common/include/linux/swap.h b/sys/compat/linuxkpi/common/include/linux/swap.h index 5828db7ae392..9c1db9677f9e 100644 --- a/sys/compat/linuxkpi/common/include/linux/swap.h +++ b/sys/compat/linuxkpi/common/include/linux/swap.h @@ -37,7 +37,14 @@ #include #include +#include +#include +#include +#include +#include +#include #include +#include #include static inline long