From nobody Wed Apr 29 21:42:47 2026 X-Original-To: dev-commits-src-all@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 4g5W4R48Pzz6c0jr for ; Wed, 29 Apr 2026 21:42:47 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g5W4R0srZz3gfy for ; Wed, 29 Apr 2026 21:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777498967; 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=BpGnwWsV5QcJHcdxrIGaGPaNN+hiVt47IcoGF1vsQk0=; b=EmVGgA1NhxTnESVAPp0LkMLTcKy9kNtcyKrrKg39tXyVRVGG+eo7bOndeo5Py4wXQcPt8+ Lpo2afgSMgq60Z6/5PT2YkhFXR3Q/6pAjyatikqybgN8TwDhLgGI4xsavfdQHYCaWy2pWW ZKJ1y2Pr1AhXT3P2mBz1d+X44n3Uq+bQqoDD855PPouQ9yYTKckXMphV34FWndvV5HSpZc nEHWiwUDZ9H8kVws9Bl6WlXkfl7gPC30lEs70evy7gxgD+6oMDIgcrRUtDNvGySUVW3LCs kc9sUVjdHukRT1qjAWBvB738dT6x0h3ucgPIurxAIWqXYj95ZNQ9GWvOg0COkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777498967; a=rsa-sha256; cv=none; b=ZH4hvx9HPP/WItYMYeXMJiddOKYncIXICYbTJWlZOa0RDVQ/vqRj6C9LrfaLJUBkLj/pQw APmeM6GxoI2BlzUrgLhB5m24UCJxozVMCZYmReut8TLPxLxYAXOjg1jf1ZcEqDtlN73IVo yE32M6YsWEcyk8IPZcOlyMuBFsADhaYrZvcNSklMWpfhLak2vFGbrxW7mb6Olsnfs88R+g 2y0EpD4qe8pF/fagA0bP14lTmueq6aMUzPnAHWiKWxyUpyVK031W0zpGPUNY5amf5LDt1P Z4IxSMaDqzYYxl33PJ8VRPGdrrMNAlnFzRSqpu7cUuiotQ1byY9UUJ/z9ChDfA== 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=1777498967; 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=BpGnwWsV5QcJHcdxrIGaGPaNN+hiVt47IcoGF1vsQk0=; b=m0mKcTIEO030CDYmC6mRtbqj4vKitXbKcbi1GfVrQ+wzmfSVgbtw3yZvvv+JNtp11aS4pB BN701wxD05WvqRMN/+s8CMje4VFgffl3n9IHJkxu0gduzzSnIgIxf9hEfJ7rSwMK7STymT TZXNSCDciARGW9r7LYCtf09a9gwn0hsj1e1T87j0YSuQ3XUkQg/f77vEoc+Mttfn2HAshX 59+KrXck/DpX/2oq+VVSy9KvO8fh8dirdchkpPlfVyPlsKyoXSj/Y1vK/wFl5Q3HSEEzYm Hpn9H2clLMjpKFCMK+PvE9124hEj74KsQVR78D7Ew0QGoOzBUYfHnYXUvyfcOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g5W4R0JFFzyRV for ; Wed, 29 Apr 2026 21:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46ced by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Apr 2026 21:42:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jean-=?utf-8?Q?S=C3=A9bast?==?utf-8?Q?ien P=C3=A9?=dron Subject: git: f3fc80b1b2c4 - stable/15 - linuxkpi: Define `sort_r()` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: f3fc80b1b2c4eab259e6f610ac0a241b71b520f4 Auto-Submitted: auto-generated Date: Wed, 29 Apr 2026 21:42:47 +0000 Message-Id: <69f27b57.46ced.7c85cd6b@gitrepo.freebsd.org> The branch stable/15 has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=f3fc80b1b2c4eab259e6f610ac0a241b71b520f4 commit f3fc80b1b2c4eab259e6f610ac0a241b71b520f4 Author: Jean-Sébastien Pédron AuthorDate: 2026-04-11 12:42:14 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2026-04-29 21:03:15 +0000 linuxkpi: Define `sort_r()` Like Linux `sort()` and FreeBSD `qsort()`, `sort_r()` is a wrapper around FreeBSD `qsort_r()`. The i915 DRM driver started to use it in Linux 6.12. Reviewed by: bz Sponsored by: The FreeBSD Foundation (cherry picked from commit 4dab15e96d40352e1a0b161a2a1cd763176108b6) --- sys/compat/linuxkpi/common/include/linux/sort.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/sort.h b/sys/compat/linuxkpi/common/include/linux/sort.h index 361b37c587c8..972c8514e6fb 100644 --- a/sys/compat/linuxkpi/common/include/linux/sort.h +++ b/sys/compat/linuxkpi/common/include/linux/sort.h @@ -38,4 +38,9 @@ qsort(base, num, size, cmp); \ } while (0) +#define sort_r(base, num, size, cmp, swap, priv) do { \ + BUILD_BUG_ON(swap); \ + qsort_r(base, num, size, cmp, priv); \ +} while (0) + #endif /* _LINUXKPI_LINUX_SORT_H_ */