From nobody Tue Jun 16 16:12:37 2026 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 4gfsTf0ZKvz6hPnW; Tue, 16 Jun 2026 16:12:54 +0000 (UTC) (envelope-from kib@freebsd.org) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfsTd3y9jz4CSJ; Tue, 16 Jun 2026 16:12:53 +0000 (UTC) (envelope-from kib@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 65GGCbxB036330; Tue, 16 Jun 2026 19:12:40 +0300 (EEST) (envelope-from kib@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 65GGCbxB036330 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 65GGCbmP036329; Tue, 16 Jun 2026 19:12:37 +0300 (EEST) (envelope-from kib@freebsd.org) X-Authentication-Warning: tom.home: kostik set sender to kib@freebsd.org using -f Date: Tue, 16 Jun 2026 19:12:37 +0300 From: Konstantin Belousov To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9a10af53dbf5 - main - Revert "kldload: Improve error handling" Message-ID: References: <6a316699.3bc7e.6c216c1b@gitrepo.freebsd.org> 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6a316699.3bc7e.6c216c1b@gitrepo.freebsd.org> X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham autolearn_force=no version=4.0.2 X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on tom.home X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] X-Rspamd-Queue-Id: 4gfsTd3y9jz4CSJ X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated On Tue, Jun 16, 2026 at 03:07:05PM +0000, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9a10af53dbf5b1268d6b74e94f2f8054caab9243 > > commit 9a10af53dbf5b1268d6b74e94f2f8054caab9243 > Author: Ed Maste > AuthorDate: 2026-06-16 15:06:17 +0000 > Commit: Ed Maste > CommitDate: 2026-06-16 15:06:30 +0000 > > Revert "kldload: Improve error handling" > > It broke the test suite, and will be recommitted when fixed. > This reverts commit db887713de2bf5c77494220a9e0ddfa7d4290155. > > Reported by: markj > --- > lib/libc/gen/exterr_cat_filenames.h | 1 - > sbin/kldload/kldload.c | 17 ++++---- > sys/kern/kern_linker.c | 83 +++++++++++++------------------------ > sys/sys/exterr_cat.h | 1 - > 4 files changed, 37 insertions(+), 65 deletions(-) > > diff --git a/lib/libc/gen/exterr_cat_filenames.h b/lib/libc/gen/exterr_cat_filenames.h > index 90e231879ccd..be65c1990af5 100644 > --- a/lib/libc/gen/exterr_cat_filenames.h > +++ b/lib/libc/gen/exterr_cat_filenames.h > @@ -12,7 +12,6 @@ > [EXTERR_CAT_FILEDESC] = "kern/kern_descrip.c", > [EXTERR_CAT_PROCEXIT] = "kern/kern_exit.c", > [EXTERR_CAT_FORK] = "kern/kern_fork.c", > - [EXTERR_CAT_LINKER] = "kern/kern_linker.c", This part ... > [EXTERR_CAT_GENIO] = "kern/sys_generic.c", > [EXTERR_CAT_VFSBIO] = "kern/vfs_bio.c", > [EXTERR_CAT_INOTIFY] = "kern/vfs_inotify.c", > diff --git a/sys/sys/exterr_cat.h b/sys/sys/exterr_cat.h > index 1c3f894e8aff..edc23d7dfbe6 100644 > --- a/sys/sys/exterr_cat.h > +++ b/sys/sys/exterr_cat.h > @@ -41,7 +41,6 @@ > #define EXTERR_CAT_PROCEXIT 16 > #define EXTERR_CAT_VMM 17 > #define EXTERR_CAT_HWPMC_IBS 18 > -#define EXTERR_CAT_LINKER 19 > > #endif > .. and this, together with the define in kern_linker.c, should not been removed. The category indexes are kind of ABI contract between libc and kernel, since libc hard-codes the translation of indexes into the source file names. When reverted, the index appears unused and could be consumed by something else, which introduces (minor) breakage for old libc.