From nobody Tue Jan 24 08:54:07 2023 X-Original-To: dev-commits-src-branches@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 4P1LPD0LkDz30wmN; Tue, 24 Jan 2023 08:54:08 +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 4P1LPC5JsGz3RCG; Tue, 24 Jan 2023 08:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550447; 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=yf+lDMDWAE1w1XWYNrKo4ZMBVayrJ+MJLPpZ1K3fre8=; b=o4FusBINnRXUOfvQmY5aOTIUN9mNk0+N7VksMK3u1SNtI6/6aq5cfLPie9J2j07P7jhjWP 5vYxM9Z5gQf3z0F92q+uc6rHlVOBXu/mk0D8ANxb9TdOsVCT0aso8oNvzIyi0/Kp/oMDLI t5JoEHO3jpK8URXjbOwBfHNhaMIJTaNrmjSp3eapIkfxY1U5lIBuMh+XgrTbCcdSDtT6om ysA0WMqGUj0PpmgUzm+KuCjmAYtzxumb161KxyS83OrM8JGX7JY6hdFPeuyZaHVbDxh6pF cTTSkhMI+QHBxUDgiLR40BtKXPQeEfWyrN5ni/6But/pod5+CjeyeHulzDyeBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550447; 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=yf+lDMDWAE1w1XWYNrKo4ZMBVayrJ+MJLPpZ1K3fre8=; b=nMyAi/SaKrY7o3LlW6sQ+we2cfem91bLPdGyjy7MeOmtNYzqnEhe398LJ8BegysfybI5Hs 5oMn0sDzk6J1gHBNft08Cqw51FcnJsVTPtLkQWLO+S3u7zI6ZRAZt1Kk1aZEidZXd9HUAi as3K/dRa/s7ehOgfj0k4DLZpAVJ/x+E77BRfrxaUkJn7r/eOJZW+PQeAutooipTKrxQLN9 j4r9sxGlkoJKK9bzf1/KHIWz+awHSUFSVnSaqAKZLUTjgMaOTBmyRyCL9k4j3YTHzFKqwh 6rldM9gKF3tuVoIUv/mpLgg5PRCVBcM8DLKICGKvKwlMyS0oq4mfI1A8lwcQuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550447; a=rsa-sha256; cv=none; b=MymoNZV/joJJbf46hsPtIKra/7rAhTZKPMNcgiMqOIbsGar/wUozsGhwSQfsISrx9hn3iw SVWLJCTtOQjBqkyUAXveVvblbN0onsJDbUvLa4Mn//b8uJ6SYHsMK5US5+xdT6UhEgyC+D cNBjQTcKnLq4jfRWCjO/XduUwLYnoOj2+870NZhVHk7p3rA70phO4KbOQGtZ7S/gQDGeqV E+AzDxt+y0DZhJZAmNdJIXK2fYUAAo8xK6xwlkND95dDeTnW+FVIyzZ/ICkjwWXwTclsnJ tXeGT/HzR9afleKW8H2uKRMy0jfXCp6/3fmCFyvjXroflGgk1EgDPFFtLELLZw== 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 4P1LPC4PqFz13Nr; Tue, 24 Jan 2023 08:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30O8s7Fs036076; Tue, 24 Jan 2023 08:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8s7vJ036075; Tue, 24 Jan 2023 08:54:07 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:54:07 GMT Message-Id: <202301240854.30O8s7vJ036075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 98a8abd1118c - stable/13 - linuxkpi: Include and from List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 98a8abd1118c33b9c9d7afe042f536f38db2221c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=98a8abd1118c33b9c9d7afe042f536f38db2221c commit 98a8abd1118c33b9c9d7afe042f536f38db2221c Author: Jean-Sébastien Pédron AuthorDate: 2022-11-11 19:59:40 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:00 +0000 linuxkpi: Include and from They are not really used in this header. However they are included in Linux and at least the DRM drivers unfortunately rely on this namespace pollution. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D37365 (cherry picked from commit 42bb5861162f071708406a8f70bcc6da5b832dc3) --- sys/compat/linuxkpi/common/include/linux/mutex.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/mutex.h b/sys/compat/linuxkpi/common/include/linux/mutex.h index 7af95e9d2dc5..3490c6e59a70 100644 --- a/sys/compat/linuxkpi/common/include/linux/mutex.h +++ b/sys/compat/linuxkpi/common/include/linux/mutex.h @@ -36,6 +36,8 @@ #include #include +#include +#include #include #include