From 469b57f3db2cdb64c5fa2a910144f784e92d6fd9 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 17 Apr 2026 09:28:10 +0200
Subject: [PATCH] Mk: previous conflicts with existing var, doh!

---
 Mk/defaults.mk | 2 +-
 Mk/git.mk      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 57328d047b..922c199231 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -116,4 +116,4 @@ TESTDIR?=	${.CURDIR}/src/opnsense/mvc/tests
 CORE_MAINS=	master main
 CORE_MAIN?=	${CORE_MAINS:[1]}
 CORE_STABLE?=	stable/${CORE_ABI}
-CORE_ORIGIN?=	community
+CORE_UPSTREAM?=	community
diff --git a/Mk/git.mk b/Mk/git.mk
index 80e7fdcbb3..e8f1bf1ad0 100644
--- a/Mk/git.mk
+++ b/Mk/git.mk
@@ -135,8 +135,8 @@ push:
 	@${GIT} checkout ${CORE_MAIN}
 
 merge: ${CORE_MAIN}
-	@${GIT} fetch ${CORE_ORIGIN}
-	@${GIT} merge ${CORE_ORIGIN}/${CORE_MAIN}
+	@${GIT} fetch ${CORE_UPSTREAM}
+	@${GIT} merge ${CORE_UPSTREAM}/${CORE_MAIN}
 
 checkout:
 .for DIR in ${.CURDIR}/src