From nobody Sat Oct 19 02:14:41 2024 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 4XVlWk2Bhpz5ZWJh; Sat, 19 Oct 2024 02:14:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVlWk1ls4z4lNb; Sat, 19 Oct 2024 02:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729304082; 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=zuOC4g87GC2zBpbYCE9fY8ntqc72+RNBZFrb7phK7Xc=; b=fDCBC0XBmMmEMXLZqMEwWMwMt5XMBZZKHloUFr45ryxLxufWfzAJT/yAInhmJHEjZ7Y0SM DonesvwQQIvXeQdZM2do1rq82iVAB5xK3Wvlv/zs1RH6ouPofPiRVrjZnzaxYcg/B23FCP y948p2Jq+4SDThoC5o/eSUS07TvGUo2/HJbzSgqcG3EBw7nvaWnh1hJz/4kTnAy/QPl7iP 9n0h4C0bbvxvGYFVeZiSh4rMUHBTSVZQSHeb1tppC1SNkCIOSskw8d34SwKt1y6lZ8CXrM RuEaOj3qtTKkO17m8NamNVRYpQNcvs0k9BnOtGxrnmYdDBO8Yv/J0tjylGcV8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729304082; 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=zuOC4g87GC2zBpbYCE9fY8ntqc72+RNBZFrb7phK7Xc=; b=OZjIPcLaq3R/4xiWVIFNIV1AK/5kpHWHW7zyOCH+VjCoQRPEz9h651AwGpE+7vK/prp5dv zvZnce6NGOUf4nSJs2RBeZcJ+wUureOC9KSRn5P0K5MAtvGfBR7qIAG2RkkAeibsIVf52K PqtFs/lP1K7O/xU23LCy4JxnVt/oYqDM5sEQMvI8DvDL9X1y/KqK5gidFR7xxaoh3eg+zH m8CKozoSF5A5TOfWc7axC+T/FE9QPYwgMnv9u/q2hNMKeqRMWcsjEOdcsckCM9js8sTkoF Fioqo7iW6ZZ3sHnZn9RJBkPuz/RGQ9Iiz2DCqMcyOe4WafZGHBoq63Gr139EQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729304082; a=rsa-sha256; cv=none; b=KdBNh08sqVCaI8H2Fbf0TFgMzrMS08RTYGGGrFGNteKH/AxaEUy+7+O/ayZmmyb+JNTSzP rEfw5phT8yKb5i7aBcYcHDJWcXeIFOSEUIc8LNGEKY83nTvMc2rup2dIfYe7OJFDaCNeKN cyYvg0Tqp5aXrjStak58mYNywVuqq0pWejkmowPdwCym6OwHGTiTDXMMhj2qeGbGr+AiV1 DMWnOYyWr/GUqSa7wodQvZiKhtKCeV+BgLc242dVHLMrUbQNRnu3ixSN3D1j202pwQoRsi jmEhX//Zproor8hHS0EKuc02F09r9jIGri0+LKDrVBYA/Klpid484aNmugKWkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XVlWk1MB6zydV; Sat, 19 Oct 2024 02:14:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49J2Eg57081940; Sat, 19 Oct 2024 02:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49J2Ef4v081932; Sat, 19 Oct 2024 02:14:41 GMT (envelope-from git) Date: Sat, 19 Oct 2024 02:14:41 GMT Message-Id: <202410190214.49J2Ef4v081932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 1e5e331b1dce - main - Correct mergeinfo from 1.14.0 import 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e5e331b1dce6c8bc05def42b41234c4f1fcea44 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=1e5e331b1dce6c8bc05def42b41234c4f1fcea44 commit 1e5e331b1dce6c8bc05def42b41234c4f1fcea44 Merge: 92c5681cc347 8ef491440fca Author: Enji Cooper AuthorDate: 2024-10-19 02:08:30 +0000 Commit: Enji Cooper CommitDate: 2024-10-19 02:10:07 +0000 Correct mergeinfo from 1.14.0 import This will help ensure that future vendor updates for this component will be more seamless. Suggested by: jtrc27 Fixes: 28f6c2f292806bf31230a959bc4b19d7081669a7