From owner-dev-commits-ports-all@freebsd.org Sat Jun 5 09:29:27 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0428C63FED7; Sat, 5 Jun 2021 09:29:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FxvTy6T6sz4jDM; Sat, 5 Jun 2021 09:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C668B5E7A; Sat, 5 Jun 2021 09:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1559TQYp038885; Sat, 5 Jun 2021 09:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1559TQSa038884; Sat, 5 Jun 2021 09:29:26 GMT (envelope-from git) Date: Sat, 5 Jun 2021 09:29:26 GMT Message-Id: <202106050929.1559TQSa038884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: cda48021e878 - 2021Q2 - emulators/virtualbox-ose: Fix mismerge in commit 751f083cf699 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: cda48021e87894097767fb725e4122d98899c1dc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Jun 2021 09:29:27 -0000 The branch 2021Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda48021e87894097767fb725e4122d98899c1dc commit cda48021e87894097767fb725e4122d98899c1dc Author: Guido Falsi AuthorDate: 2021-06-05 09:25:39 +0000 Commit: Guido Falsi CommitDate: 2021-06-05 09:25:39 +0000 emulators/virtualbox-ose: Fix mismerge in commit 751f083cf699 Direct commit to quarterly to fix a merge mistake in the checrry pick of commit ef04eff33cf6. Reported by: bdrewery --- .../files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c index 712a3602a2da..b06eaa6d69e3 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_freebsd_vboxvfs_vboxvfs__vfsops.c @@ -9,7 +9,7 @@ /* * Copyright (C) 2008-2020 Oracle Corporation * -@@ -14,245 +9,478 @@ +@@ -14,245 +9,482 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */