From nobody Fri Nov 20 18:19:35 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 4jWNsM2flsz72P5G for ; Fri, 20 Nov 2026 18:19:35 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jWNsM1nBHz3CVF for ; Fri, 20 Nov 2026 18:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795198775; 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=ush/iwG3wuzcw98P9eQD0FEMdNb5/iIhesEJQC1KD1s=; b=lJ7ewY8Az4sq1YXGDecbsKSRC5BOOCDwWT6277NTh8PhYHjGhlkyFaP287feW+m7OjzwRl qLt9lbgBsqxnGodg5HkECC1Q3MuI8o96Q83N0LvR21kZ43S6n+SgAuMaUpjzfPxo3t1Z1/ hC3I94tCg5r+w+uTtHOby0iOy0v7g6Ynz5Eq+mNSU6RmnfWpG3Uw6FHActQsqUHgKSm8/r LIdqrIoyZDrjGKKRXzdT/RV0TxCI/7y8gh0NBD1av0DABwX59P/k6JLs90iN18Wmr2fUuJ lqkVRLtKBRKPw7G8FTbLrDNDHT5dSIJq5xaw8RNA3yXlgAdytoVFFeZfnE9glg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795198775; b=SwEP2a1svVt9WMvF7q172mKLczuYqDjjuXqIup1AwNpw+Qn2H08Kc4waLyykPEDLRzoVY5 ShivoUr8yby6l5GKoKvpdMlYA3aAsssaTI2kEYmVxRVQjGreWd4roVUEM02CcqUCQ20p2E NtREGUxyHdylcTKZUwXRdjMZw+i6PULL+G6yhUtJc9X8ny4fjHxJVzp1jGsB2XLO6HEDv9 /9ukjCj5hAfjC7+CrY1Spkx7x7YTGMK1EjEzrjYIFNOFQFa0zCLDAr9qPlhmuAwDtkYxLh ERzLkgCm6UvckzT/QR7TAWgNPAI+y2e/wBeUlBZay8TeR9+33bIs30yB2ldleQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795198775; 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=ush/iwG3wuzcw98P9eQD0FEMdNb5/iIhesEJQC1KD1s=; b=MMxlErzvUV3RAF3ggBkIcMXW3/Ur5GLccAkBu8yduuAnNQKBLdGrxwNHS2IzNWmpE9mCD2 sKv2+HNlV2Jt7tokK5J/NPPEffgMP8iPnaEpUNGp1r+Lb+yJZ1JrRUVtMAaa4TrlpRnz8u QecJC2xuWPjlo1Lzv5lOodRgBMKqlNiyhWBemfKujcuUEq4SGjixKioIxryX5h/HM7HqjS jqKIqDZEnslzZglMxCbNlyZ/ehElG+kES08Vl0IrLprwmdVyNQEiOnZ8MZbEvqnjneVBz9 0OdFep6kVe7ifspjv2JArcEJH1N0CR7vKSndCAFI2MR9xeVqV43qCKKy/j2Tsw== 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 4jWNsM17y7z1010 for ; Fri, 20 Nov 2026 18:19:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22d4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 18:19:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: af641e950df6 - main - LinuxKPI: Include from List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af641e950df629f980e545e0a9f75db4ad156cd6 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 18:19:35 +0000 Message-Id: <6b008f37.22d4.7efc9af0@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=af641e950df629f980e545e0a9f75db4ad156cd6 commit af641e950df629f980e545e0a9f75db4ad156cd6 Author: Vladimir Kondratyev AuthorDate: 2026-11-20 18:17:59 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-11-20 18:17:59 +0000 LinuxKPI: Include from and from . This reproduces the same namespace pollution as Linux and will help us to fix historical bug when these files were included from . Fix conflicting Linux name leakage appeared in qat(4) as result. Differential Revision: https://reviews.freebsd.org/D60798 --- sys/compat/linuxkpi/common/include/linux/io.h | 1 + sys/compat/linuxkpi/common/include/linux/mm.h | 1 + sys/dev/qat/include/common/qat_freebsd.h | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 5da0b64045f2..c5d944cb1047 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -38,6 +38,7 @@ #include #include #include +#include #if !defined(__arm__) #include #endif diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 1732e21de5cf..3fa0e32d966e 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -43,6 +43,7 @@ #include #include #include +#include #include diff --git a/sys/dev/qat/include/common/qat_freebsd.h b/sys/dev/qat/include/common/qat_freebsd.h index 179d6bbfc228..10511dddb234 100644 --- a/sys/dev/qat/include/common/qat_freebsd.h +++ b/sys/dev/qat/include/common/qat_freebsd.h @@ -16,6 +16,15 @@ #include #include #include +/* + * `linux/device.h` redefines `file` to be `linux_file` to manage the + * name conflict between the Linux and FreeBSD structures, while avoiding a + * extensive rewrite and use of macros in the original drm_fb_helper.[ch] + * files. + * + * We need to undo this here because we use FreeBSD structures. + */ +#undef file #include #include #include