From owner-dev-commits-src-all@freebsd.org Sat May 29 23:57:16 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B686264AA8D; Sat, 29 May 2021 23:57:16 +0000 (UTC) (envelope-from jason.harmening@gmail.com) Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fsz4X4YBWz4pbq; Sat, 29 May 2021 23:57:16 +0000 (UTC) (envelope-from jason.harmening@gmail.com) Received: by mail-pj1-x1036.google.com with SMTP id m8-20020a17090a4148b029015fc5d36343so4591537pjg.1; Sat, 29 May 2021 16:57:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language:content-transfer-encoding; bh=pmcrA+8tHP9H9x4LcbTDDtT8qtq4icKAvyQ0gYfZW6A=; b=h75+coVLfk9DgqmznX3QGGiN1V6RHL1+Ml5M9TGuAUJKyM0ioR6k/eC9lto1KDQ8jn QKuWeTggHt6EFyYh5Vrk3J80Fv6Mdc//z+Y9ywPzs19gIuXaUhPC3eKpAyAPzFohWoWy 22bUXeaP8/4bPoQypdgnIRva0vsyJ6LRW1t3EYKE7y9fcUctX52ecJPbGWEC8Bv+s2vz /0a5jpSuNbP3cJvMTeCcGhoMGaPU2OkCvobWiPxqouSnnB3qzitUCruW2XLv4+SeW3bN qsv4uoFDV7v1xyCuiyVxaCDKovDkJH8zKqmEGM+dWzyGFIWuhIFbdgR2sqjtThDop+4W r5nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pmcrA+8tHP9H9x4LcbTDDtT8qtq4icKAvyQ0gYfZW6A=; b=QzMq67b0VQxyBSR+Gl4AhtlMMaJ49G1f91XQKDdQTCAHjnBMfWwDf6frUiB8STv0G9 Hk2zrFKKlxD9J0lQza6IxL2MqtZIUeVN6g8j4CkH0snZpLvxMggEgnlFN/UsytWSlVzn 785i5nktU6gJ+UOneBKzeAxo/JTgxcdPuhqoWJSbVYbCCrcquZqhVdljjTiJWIKCG+pR 5ktGiGgtIHQa1xyJL7ruGmpho2k+W6MXHQS+ypHh8pN7hTspPFTdfK2xsMVuNeYl1LLY IupiUy5dqT4Lc8xTun+Up0wftvFEzh91OTDx0ALR0egxUubgnjivAzdu26KMqogJnKSF 2AKg== X-Gm-Message-State: AOAM530xHD/MQTAFhNb9Se0ZTAu4xQgW6xh3kU2w8e/F4E2ejr8beSRI GGmlfcHtiSXpW1akGzQ1+/FQbo7b0Owr X-Google-Smtp-Source: ABdhPJxXUSrHIm+isysX3vYFPfH8U6GHzGXqLeC3EShauanOtRgHDXyXyQFCWaErYQ+0TvUfvnF2LQ== X-Received: by 2002:a17:90a:4216:: with SMTP id o22mr11906158pjg.3.1622332634441; Sat, 29 May 2021 16:57:14 -0700 (PDT) Received: from [192.168.42.3] ([97.73.80.132]) by smtp.googlemail.com with ESMTPSA id x15sm129817pfp.79.2021.05.29.16.57.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 May 2021 16:57:13 -0700 (PDT) Subject: Re: git: 54256e7954d7 - main - Fix userspace build after commit 6d3e78ad6c11 To: Rebecca Cran , "Jason A. Harmening" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202105292142.14TLg7ol096256@gitrepo.freebsd.org> <387f2176-0cb0-fcbc-1294-f2dfc0ffa9d7@bsdio.com> From: Jason Harmening Message-ID: <802d7249-9fbf-d3da-9b70-9865e10a39c4@gmail.com> Date: Sat, 29 May 2021 17:01:50 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: <387f2176-0cb0-fcbc-1294-f2dfc0ffa9d7@bsdio.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Fsz4X4YBWz4pbq X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2021 23:57:16 -0000 On 5/29/21 4:50 PM, Rebecca Cran wrote: > On 5/29/21 3:42 PM, Jason A. Harmening wrote: >> The branch main has been updated by jah: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=54256e7954d7efeee53bd1ab4d08d0c772b55f4d >> >> >> commit 54256e7954d7efeee53bd1ab4d08d0c772b55f4d >> Author:     Jason A. Harmening >> AuthorDate: 2021-05-29 21:45:09 +0000 >> Commit:     Jason A. Harmening >> CommitDate: 2021-05-29 21:45:42 +0000 >> >>      Fix userspace build after commit  6d3e78ad6c11 >>      Reported by: jenkins >> --- >>   sys/sys/mount.h | 2 ++ >>   1 file changed, 2 insertions(+) >> >> diff --git a/sys/sys/mount.h b/sys/sys/mount.h >> index 684d8c3eb780..6c1cd82ee84f 100644 >> --- a/sys/sys/mount.h >> +++ b/sys/sys/mount.h >> @@ -43,6 +43,8 @@ >>   #include >>   #include >>   #include >> +#else >> +#include >>   #endif >>   /* > > I'm seeing this error even with this commit: > > > --- lib/libprocstat__L --- > In file included from /usr/src/lib/libprocstat/msdosfs.c:51: > /usr/obj/usr/src/amd64.amd64/tmp/usr/include/sys/mount.h:765:7: error: > unknown type name 'bool' >                     bool *mp_busy); >                     ^ Yes, it turns out parts of libprocstat like to pretend they're kernel components for the purpose of including mount.h. I think this should fix it, but I'm waiting for buildworld to finish to be sure: diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 6c1cd82ee84..3c7f4b9a427 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -38,6 +38,7 @@ #include #include #ifdef _KERNEL +#include #include #include