From nobody Tue Sep 10 15:42:40 2024 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 4X37J51yf4z5W3kT; Tue, 10 Sep 2024 15:42:45 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X37J50FS2z4smn; Tue, 10 Sep 2024 15:42:45 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2e.google.com with SMTP id 6a1803df08f44-6c34dd6c21aso6414476d6.2; Tue, 10 Sep 2024 08:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725982963; x=1726587763; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=MKDv0+funX1K4gmCV5revGBVXD5bPCJOjg/Kf8Bukv0=; b=OSixyeuQIczF9sGf7bx90S2daQiwroxfITH9DBx9Ron/qMLGo2LhC8pvnBh6boFFud 4f7LRF6EtXy6M5PWOHLQgunMZGNLmyLSIIFao2PIfACktOP61uZtsG9tj4nSm/pQGgRy JAKkyeM9l+H0ngS0GIwphoXUmCxilGOG0IYVa3uUqDsY1dXODEk+adyJb831Y1JQppXM qgiBh/y/xzobr5An9IAb1QS8U+l+10+PxXK/XqTfpTQI/+MFHnjLK4g67VPylycqznw3 Ew01c6KUBoxSlnDcthAbemqXHvLvmXhwEBR6WrVtPCKZPPHQW7GhEr4pRVLIx0065eIc KmHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725982963; x=1726587763; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MKDv0+funX1K4gmCV5revGBVXD5bPCJOjg/Kf8Bukv0=; b=nhfMyv9lMaVRtOyHEr8rGa6FHvWLHv9d1PPUX7y8cThygSfuiEUuP2sgeS5fO551nb yLXLrg5csHiJlZQOnIGqygY+eW6FcsrhNQRT1SDei14Sf/KbF4pIamlHLuvqVL/NgO2C 1iDyIQZoJvpUSNv6WGuueJUpfOFepIi8I34eBRwqoAj+d2sbf6nHkWX0/KCW7f22/0t5 Z6yfW6lVvAliDvxEEO2L36eie9MfTduAknuh+d29lqDheX7teH+i2gFf65PonDdfFPQW NSlxbLkgtM8RXircypggmqhZd2udEh9xvJWa/cW3SUbsaIZmYOwddfaAAkx9tQHj5Sah q6VQ== X-Forwarded-Encrypted: i=1; AJvYcCUJ2Ya1G15D0eIeCQGbkgh3ScJQYXs1qPZO6LNY511LPVAxsswCDPvaFapn6iRgHP/rIV+MSHvYjPqvz0OPc/xsWUgxTiw=@freebsd.org, AJvYcCUoMsDPn3p/P2GN5FkjyvVc9ixznN13Ate3j0z0fT07SYQifM2gIu51RCJpvBIcNUIOIUA=@freebsd.org, AJvYcCVcs6X1YsOyanHc1HRoTEIXZ9ZZVnqxlQ3k0XtcgGhyaq/HiPY/QGtCmj24kddzNgj8YhA9C7+Upw58NjGBV/Xyj2Ni@freebsd.org, AJvYcCWLpOyesUVGVvyH87WvuEzDkyUOqHkEUelLVpY9tEiM70YvjXvH4yrn6I0V6m8K25D7aW6t48H+4UmdB4F2ehs=@freebsd.org X-Gm-Message-State: AOJu0Yxy+67S087klIWbst+ZdOyJjvLpfzSv2VOn8gmYkxKcIibtbZE3 4CPZbfPHHh0WnqjYiSeVwCmVdFXYSIcsbYuaGSeoDQUPhauFs94xk0ikWYy1 X-Google-Smtp-Source: AGHT+IHyKg7CABu1/rwKmgnneM3DhpqoFc4NkTjL43SAr+NuB1Zh3LvGKqedhMTgylNOZBRCgbwhuA== X-Received: by 2002:a05:6214:43c7:b0:6c5:50bb:d59d with SMTP id 6a1803df08f44-6c550bbd710mr79031356d6.37.1725982963596; Tue, 10 Sep 2024 08:42:43 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6c53474d8e2sm30885846d6.87.2024.09.10.08.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2024 08:42:43 -0700 (PDT) Date: Tue, 10 Sep 2024 11:42:40 -0400 From: Mark Johnston To: Jessica Clarke Cc: Alexander Motin , FreeBSD User , Martin Matuska , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: e2df9bb44109 - main - zfs: merge openzfs/zfs@b10992582 Message-ID: References: <202409091648.489GmCNu009544@gitrepo.freebsd.org> <20240909204632.78f3b525@thor.intern.walstatt.dynvpn.de> 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=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4X37J50FS2z4smn On Mon, Sep 09, 2024 at 07:58:59PM +0100, Jessica Clarke wrote: > On 9 Sep 2024, at 19:52, Alexander Motin wrote: > > > > On 09.09.2024 14:46, FreeBSD User wrote: > >> Am Mon, 9 Sep 2024 16:48:12 GMT > >> Martin Matuska schrieb: > >> the commit seems to breaks buildworld for me, somehow: > >> [...] > >> /usr/src/sys/contrib/openzfs/module/os/linux/zfs/abd_os.c:61:10: fatal error: > >> 'linux/kmap_compat.h' file not found 61 | #include > > > > I hit it also, but it has gone after I wiped the object directory and run a clean build. This commit uses different abd_os.c from different directory, and seems something is getting confused in the process. > > tools/build/depend-cleanup.sh needs to deal with > cddl/lib/libzpool/.depend.abd_os.* then (and libcompats). This should be done now in commit fd3d3240b0d7. (From what I see, libcompats are handled automatically when using clean_dep.)