From nobody Wed Mar 4 17:57:29 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 4fR0kK6Wqsz6SqLZ for ; Wed, 04 Mar 2026 17:57:29 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fR0kK5ksyz42Mg for ; Wed, 04 Mar 2026 17:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772647049; 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=DlrRLb/OuRpic+4aTY5utjXK1b19malbPoB4UOsAVe0=; b=qoYXJVJmHIfsuONu1cNvG1x37msTqw66+WKCKgI1RUIz/jUtyYhbbcVWM9vDXMhwszrUsu Neovw489mPtQaGVh91/0ip62Jm8/icbeHrtZl0ppHKtEjXy851Wzd88mjigO/6ZEinExhL NGNsA5YCyllGS2R9l6LwgAyfwmvS2ao6m1K6jN8nyFsKvQewdf8bog11kJ6C/7KLON2dpn DoFo5Pw/D4QXTEyges/IW8fdfxxwfA44zzaXx7x7nOlhJSDahTol/2didQcHi/GpPcCBuJ vYh7WcRXfO9OSLWWpTW0g6s+Swo2fhwWDy8/AFtf89XuRneW6qbaNLnGZQhw7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772647049; a=rsa-sha256; cv=none; b=EPBrsJ5qYRmFo9CBbSwKVjN9wlolTEnwZUQH2F+u/Yczjgk+6n0Xs8CqJhc8B+1zNFM9Hz J/QxG61bMU5EWqaDRPUhVklp+81oGGmdACVu8mBC5CjOYVXg500ELEybAgO1J7VKrA+My0 c7/Sw7vDN6dGz9dDmNUmV7EKssxYTNQ8eo3NoHmxDT/DS4HkO61SdOagqBo6OQ5fiDR97O T3UsDb8iqCSYBIixFwEl/X8+4ph5ZzEbIo78T0vYUKcDL53qM40QSwXgz9rpVUqESZe6LR mW4WZXDdJsYcYEXn9ZD9mZhWLusqvtkmQIP0JEy1Ggxki70mFC+taNW9uH7lsA== 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=1772647049; 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=DlrRLb/OuRpic+4aTY5utjXK1b19malbPoB4UOsAVe0=; b=YjLqQnXRSyTVSLyaVnh9jKsdFcCGtHtJx/XZBoSakwG+2CyYwFHZ63gs06HAE7tRUzgIxJ d8IgvOHoVZ89QdicCe5AIS1uqDU8Xg34V15cwgcl3i1bSGXD76spl19sCivXzSu4cNv0Z1 gxTP9kl8lIOv8MYsa5jlP17V7+l6hzb/51ooUQafA6zFXqdDFZuchLFnxMi7l/2+fIMi9E Ih44cc/TPUoajVQx/un5cZPW3C+0/iD2GoAvqrC4Ee4XlIhNFUBOtaBBVABgeTUDFw9Mlg b4gmoKydwbuRohMB1JIy3o2PPFYw22awFL/0Q6896qrvplEYKCf+NAZTseUoWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fR0kK4rk7z11hm for ; Wed, 04 Mar 2026 17:57:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ffa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Mar 2026 17:57:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8d5e8dfdc22c - stable/15 - ObsoleteFiles.inc: revert accidental merge failure 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 8d5e8dfdc22c52bc944d80d5a8811373de001517 Auto-Submitted: auto-generated Date: Wed, 04 Mar 2026 17:57:29 +0000 Message-Id: <69a87289.42ffa.25a411ea@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8d5e8dfdc22c52bc944d80d5a8811373de001517 commit 8d5e8dfdc22c52bc944d80d5a8811373de001517 Author: Baptiste Daroussin AuthorDate: 2026-03-04 17:56:30 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-04 17:56:30 +0000 ObsoleteFiles.inc: revert accidental merge failure Reported by: des --- ObsoleteFiles.inc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 3b7907085f9c..4a92f2778d8c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -75,22 +75,6 @@ OLD_FILES+=usr/lib/libkrb5profile.so # 20251218: Remove old MLINK to apmconf(8) OLD_FILES+=usr/share/man/man8/apmconf.8.gz -# 20251215: Remove intrinsic utilities -OLD_FILES+=usr/bin/alias -OLD_FILES+=usr/bin/bg -OLD_FILES+=usr/bin/cd -OLD_FILES+=usr/bin/fc -OLD_FILES+=usr/bin/fg -OLD_FILES+=usr/bin/getopts -OLD_FILES+=usr/bin/hash -OLD_FILES+=usr/bin/jobs -OLD_FILES+=usr/bin/read -OLD_FILES+=usr/bin/type -OLD_FILES+=usr/bin/ulimit -OLD_FILES+=usr/bin/umask -OLD_FILES+=usr/bin/unalias -OLD_FILES+=usr/bin/wait - # 20251208: Rename iwm8000C to correct name. OLD_FILES+=boot/firmware/iwm8000C