From nobody Tue Jun 23 15:56:54 2026 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 4gl8nz0pXHz6hf8k for ; Tue, 23 Jun 2026 15:56:55 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8ny4N4lz3HYr for ; Tue, 23 Jun 2026 15:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230214; 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=b+hVjSgcXjb9wvgcQ7gsEwSou3NR6UWgloPkNY1sjB4=; b=USdKVjcyKKxPWzv3J8gcGyjv8uDDYBrIZ4xAkJMJ/0Xe35zqZA+PBOjOM1gk5dZ/c0VFXg vqTDJSN2qIpC4Orfpl01mGAK4XYsGb+xS/RoVCWaijknSXk++/+D3FjHLI5XSqgKQum/fZ WIqCW4AmgkE0iJonDRA07yDDexGOhrdQ5sBrToXj0z+utpYECTOJIAPpLYQCSNyd5aq+j5 EpDNbpaBku/pZY9vTUvMZCdlNL84AxPK+jpxdPc63AOlVoXkPJonLOROmUvOzL7daodgvC r9lZFkVEQjuR6jCtyseTcLqrSeKfTs8ruTXW8YXAiUhw+yj7kCISoDKWKG+AFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230214; a=rsa-sha256; cv=none; b=u4a2ldr3KHsIo0oOOqriy4Lhc6/jR1DwMGCWiDF+8MKJFMJSkJZ12rkzf2f6EM7OEGqWTR w0r2zbLMMjhzQQ/JsvPbZHXBZDGXgo9Eoyw8QNsxoHVuDk13SwTmw5NYB9EpS8H4XOwoCK nUrRTlzgZwJT7lFNQFZSbHvZ5GzUOx79exh4LuEReja1zo9MalON+gY82BMO8FBD/xsrpd r0GA5EZLhq2vKrOkcwwjxEac3pfOJkbchnpPGb8QYfDHX7Vs42WxYvsE5n1aLKBG7KqGnn 4+YP935nd7573x0O94F8CGcf24RxM5x2KtE7vfvFb3xB+pos/jkMIKlaWhfHxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230214; 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=b+hVjSgcXjb9wvgcQ7gsEwSou3NR6UWgloPkNY1sjB4=; b=BMkX6V9qZQLKC1MYsrw4E/q7MXlb3gNpOPnHa+lm384OGXYieWXDlDpdc0jyORxsZ8ldhy LDORKILMCNM4+kNVoyVEELA4S6Rf4k2kDVO+UlrPe7/dCHmGVnUTrWszzTTkp/kHs7kDEm IfZtdwv+BEvJoQfTKBDYfLx8wSxkN+VPXi0WNlTq2KXunL13rjstpZ+ydSWyfgzs9KB0KT uYpsC1e22wdwNImp8cxZuNJgdTwSua3yAaNf2WY1VricXGLXBq0N6w59/rJBlIj1QbrNZS o+YvIo3dUiM6LFvvtb0D0N1fK1vMgaUQ03Xn8waWMOPuFkY+d+zSVR9G2C+Lcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8ny3NyRzhJD for ; Tue, 23 Jun 2026 15:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f77 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 848750b75756 - stable/15 - zfs: Reuse ZINCDIR variable from kmod.mk 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 848750b7575626b90b3ab007b19f0e4f4cf3db15 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:54 +0000 Message-Id: <6a3aacc6.21f77.4159e70f@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=848750b7575626b90b3ab007b19f0e4f4cf3db15 commit 848750b7575626b90b3ab007b19f0e4f4cf3db15 Author: John Baldwin AuthorDate: 2025-12-09 16:00:20 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:30:16 +0000 zfs: Reuse ZINCDIR variable from kmod.mk Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D54147 (cherry picked from commit 701e4b36b4510c8cf26155ec3ab5aca9b7ba9406) --- sys/modules/zfs/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 7a4d0bb51376..2751bb465258 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,5 +1,4 @@ SRCDIR=${SRCTOP}/sys/contrib/openzfs/module -INCDIR=${SRCTOP}/sys/contrib/openzfs/include KMOD= zfs @@ -27,11 +26,11 @@ KMOD= zfs ${SRCDIR}/zstd/lib/compress \ ${SRCDIR}/zstd/lib/decompress -CFLAGS+= -I${INCDIR} +CFLAGS+= -I${ZINCDIR} CFLAGS+= -I${SRCDIR}/icp/include -CFLAGS+= -I${INCDIR}/os/freebsd -CFLAGS+= -I${INCDIR}/os/freebsd/spl -CFLAGS+= -I${INCDIR}/os/freebsd/zfs +CFLAGS+= -I${ZINCDIR}/os/freebsd +CFLAGS+= -I${ZINCDIR}/os/freebsd/spl +CFLAGS+= -I${ZINCDIR}/os/freebsd/zfs CFLAGS+= -I${SRCDIR}/zstd/include CFLAGS+= -I${.CURDIR} @@ -388,7 +387,7 @@ SRCS+= zfs_zstd.c \ .include CFLAGS+= -include ${SRCTOP}/sys/cddl/compat/opensolaris/sys/debug_compat.h -CFLAGS+= -include ${INCDIR}/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/static_ccompile.h CFLAGS.sysctl_os.c= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h