From nobody Sat Apr 25 18:44:13 2026 X-Original-To: freebsd-current@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 4g2zJb3nVGz6NMdj for ; Sat, 25 Apr 2026 18:44:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) (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 4g2zJb0KCKz3YCR for ; Sat, 25 Apr 2026 18:44:30 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-c76c067bc51so3464222a12.0 for ; Sat, 25 Apr 2026 11:44:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777142665; cv=none; d=google.com; s=arc-20240605; b=j2l/mdHquf70t3uR6XneCKZNXOf9y/7wCdSO/dxIRuJ1dxxF2aD+CLdMCXfpL7STzs Ws25QkqnV2k2KHBBczO+NGrriWw20/MQcuOlQC/OH8XS/depVwjrstuPgm+SewrqFMco Wfc6T+SpHYM30dVIHuHoi7zuTy/Luh61BIW4XcMJ/mBiOV9beoe62lvBo03xfL9ypaMI w4QOG64tp8rQlrKQywRCeEUXEhInKgCe51rhMYocq2wScjjwGWzWwTDIggXmWY+D/0Lm sGtMZroPg5IScikxlAoK0G4KNiZUmse0N9ifBJ5MXAMG8oMdkp5FoIvZCDKz4dEJmIWK xN/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=DC9dzJmGqG7KE/kB+WwP81GD2PQfBPn83iafgVx5EBo=; fh=SPAptHSKShad+rdzMnwtrOdh3YZDVqM+HwVAsrfGXuY=; b=a9LiMtR3H4Vj+CHNWomeMSWMfbVCHjWvvg+5lgz4LX80Sm41Ru9uhPnA0TdmK1GurL 7nD63CGwT7tCKHUfyLA7pjPPJf/wAXZdfNck7jW54yU8Doeb+YyVOlxbxNJb4h27gGoG YmUhpTJnhNX+2cGkTteqsvp0Q/w1KXr9ucMdvHX7AZ4Roo4WIi+sfvS25kJbnnupRB6P /sM7sZPKmENvpN0BQubynVabh+nOV2dcb8rwBk8az1Vf1auGCliPzPABOTzcRxLqRkjN Jfa3wXJ+WdVEx+qFNQS/IF+2reeaqY8QimNvUw2doNOJOGT54ALq4pE+kSXayoIY8R/A q9Tg==; darn=freebsd.org ARC-Authentication-Results: i=1; mx.google.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20251104.gappssmtp.com; s=20251104; t=1777142665; x=1777747465; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=DC9dzJmGqG7KE/kB+WwP81GD2PQfBPn83iafgVx5EBo=; b=byTOa0x/io0NN+QydK37Uk3ecW2rC4PPkm9j1LOYdjEA7iy4etZ3ZWyaVe/6lvjrO5 +h32eWvCY3ncj5boL6qEjovOpXI+rP+6xF61TOrgVnc3aDlTbv2ksLL798AhxnaiWymi 2Rpd+3VHe4q4WXoge4WP91vwO7tzxrw/n5yo2Fwj04xNXg0FVcGEfQ7ai/gRhAggTGza bNAYpb/Gq2W73xCpkLckb6FKOWL6bPfMfvgGxmAlNEFrlB3FFHRTCVm6KlIWBrPGLbJb lbSA8ZID5JdN0yXyF/+bZ9/4gDqO449+73hc8HIJapMexJJqQrrehUxhgR9IPoEudfjt eaRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777142665; x=1777747465; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DC9dzJmGqG7KE/kB+WwP81GD2PQfBPn83iafgVx5EBo=; b=EeYBvxuiRLBHqNI7kEGvpvzSjhjE2PBe3Z+FaQnoMrnZj3OAWSHwGF5YewJVp5fEjC ibp8YvaTlY5PoJtRcBX/kJY0U4pl8Y7BeqY5or3IZuf3QtUD6xjA4C7ykwL9z6P0sUxR XhJyhdsllL/aY9h3/cRebPtHPH6+Lh1lgl99YJ0OSScvW3G45VC4l5Dt2iXdeZMjB6u3 33LPVrAZUJ95MSi8tDne5wZWEp2p2LBJ5SAI3oryBDlru0RV5uY1SwQQRFaW7UspnHEU Z8CYR/JAafrHGi80FcjQCj5a5cwI1RFp540pClz8lyQq7hZrrVlow23G+zGjpYIspFkY 4f0g== X-Gm-Message-State: AOJu0YxgPVPh48+L27L79QrhJy40HKMH5Qb7vb1X9jMl26rbpXCFh90P +T2XFDOfGIwfsbtqO4K7PKAeQ/wqX/0kuJOseyHpsDBgQuWzxBxeGaOzEvBDXlgc9See5dGTEXN 0DgWVD7ZUgikvwoMuBBvxl69iDjqZ50T3NL8lzdCT4xDYL36Zf9CmuRw= X-Gm-Gg: AeBDiet77XZOHFw/IaFHF4ohVgcIX86ptpU6j69DSqH5zxiROJUfKCNFxz33eUZNwUz 4EfztBtn6owd6vXgggElsSpJGMZJJdnbfPalLSyBmZe6/k1GSydwMBP5AQtt+BqsuLr0yCK4Py7 d/olO3Gw2O0kOGgNTuJRS2lAhj5eMx45H0AMhh/bUicbtXYONBrjO0COsv9ZTWquW0Zm/bP+2iw tti+v99uzQk70ZZf5udPwWR6Qemo2EQBrtZPFh3vDtpfWNC1ve4C+z54iF4s7uqVxJ+RAPKFh6T xS8elXRcQaCbDNfI0D0job4LtASngT7mJTU423o7TjM/dFY= X-Received: by 2002:a05:6a20:7d9c:b0:39b:f026:6f8d with SMTP id adf61e73a8af0-3a08d8e27f9mr41951655637.43.1777142664626; Sat, 25 Apr 2026 11:44:24 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 25 Apr 2026 12:44:13 -0600 X-Gm-Features: AQROBzBaBYWB_MlCenvh5l0CGCg5lkKzilk-ejvmO7FwbTlzt5F5O1Knu7MPyCQ Message-ID: Subject: Re: Git balks at untracked files in zfs To: bob prohaska Cc: freebsd-current@freebsd.org Content-Type: multipart/alternative; boundary="0000000000003d933906504d45ed" 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: 4g2zJb0KCKz3YCR X-Spamd-Bar: ---- --0000000000003d933906504d45ed Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable So first off, do you have files you want to keep? If not, then read on. On Sat, Apr 25, 2026 at 11:58=E2=80=AFAM bob prohaska = wrote: > For the last few git pull sessions git has been reporting > error: The following untracked working tree files would be overwritten by > merge: > share/man/man4/appleir.4 > sys/compat/linuxkpi/common/include/linux/hex.h > sys/contrib/openzfs/.github/workflows/zfs-arm.yml > sys/contrib/openzfs/man/man1/dbufstat.1 > sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c > > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_change-= key/zfs_change-key_userprop.ksh > .... and so forth. It looks like all the complaints are about openzfs > > Runnig git reset --hard appears to clear the error: > root@www:/usr/src # git reset --hard > HEAD is now at 2b954770ddd nvme: Use passed in max_pages. > > If I re-run git pull the system reports an update available and fails > again: > root@www:/usr/src # git pull > Updating 2b954770ddd..7f207b6443f > error: The following untracked working tree files would be overwritten by > merge: > share/man/man4/appleir.4 > sys/compat/linuxkpi/common/include/linux/hex.h > sys/contrib/openzfs/.github/workflows/zfs-arm.yml > sys/contrib/openzfs/man/man1/dbufstat.1 > sys/contrib/openzfs/tests/zfs-tests/cmd/clone_after_trunc.c > > sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_change-= key/zfs_change-key_userprop.ksh > and so forth. > > It looks like I'm stuck, is there a way to get unstuck? > git clean -dn this will give you a list of files that will be deleted, updated, etc. If the list looks good then git clean -f or git clean -i The former blows everything from the prior step away. The latter asks one by one. If this is supposed to be a completely clean tree, you can start here. If you have like a kernel config or something, then you'll want to proceed with caution. Warner > Thanks for reading, > > bob prohaska > > > --0000000000003d933906504d45ed Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
So first off, do you have files you want to keep? If = not, then read on.

On Sat, Apr 25, 2026 at 11:58=E2=80= =AFAM bob prohaska <fbsd@www.zefox= .net> wrote:
For the last few git pull sessions git has been reporting
error: The following untracked working tree files would be overwritten by m= erge:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 share/man/man4/appleir.4
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/compat/linuxkpi/common/include/linux/hex.h<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/.github/workflows/zfs-arm.y= ml
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/man/man1/dbufstat.1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/tests/zfs-tests/cmd/clone_a= fter_trunc.c
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/tests/zfs-tests/tests/funct= ional/cli_root/zfs_change-key/zfs_change-key_userprop.ksh
.... and so forth. It looks like all the complaints are about openzfs

Runnig git reset --hard appears to clear the error:
root@www:/usr/src # git reset --hard
HEAD is now at 2b954770ddd nvme: Use passed in max_pages.

If I re-run git pull the system reports an update available and fails again= :
root@www:/usr/src # git pull
Updating 2b954770ddd..7f207b6443f
error: The following untracked working tree files would be overwritten by m= erge:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 share/man/man4/appleir.4
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/compat/linuxkpi/common/include/linux/hex.h<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/.github/workflows/zfs-arm.y= ml
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/man/man1/dbufstat.1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/tests/zfs-tests/cmd/clone_a= fter_trunc.c
=C2=A0 =C2=A0 =C2=A0 =C2=A0 sys/contrib/openzfs/tests/zfs-tests/tests/funct= ional/cli_root/zfs_change-key/zfs_change-key_userprop.ksh
and so forth.

It looks like I'm stuck, is there a way to get unstuck?

git clean -dn

this will give = you a list of files that will be deleted, updated, etc. If the list looks g= ood then

git clean -f
or
git c= lean -i

The former blows everything from the prior= step away. The latter asks one by one. If this is supposed to
be= a completely clean tree, you can start here. If you have like a kernel con= fig or something, then you'll
want to proceed with caution.

Warner
=C2=A0
Thanks for reading,

bob prohaska


--0000000000003d933906504d45ed--