Date: Sat, 5 Jun 2021 09:29:26 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: cda48021e878 - 2021Q2 - emulators/virtualbox-ose: Fix mismerge in commit 751f083cf699 Message-ID: <202106050929.1559TQSa038884@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=cda48021e87894097767fb725e4122d98899c1dc commit cda48021e87894097767fb725e4122d98899c1dc Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2021-06-05 09:25:39 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106050929.1559TQSa038884>