From 826290680dbd9b4338c4ccb2968f201ab7305769 Mon Sep 17 00:00:00 2001
From: Palash Gandhi <palash.gandhi@delphix.com>
Date: Wed, 31 May 2023 09:58:29 -0700
Subject: [PATCH] TOOL-21469 Allow empty commits when cherry-picking in kernel
 repos

PR URL: https://www.github.com/delphix/linux-pkg/pull/290
---
 default-package-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-package-config.sh b/default-package-config.sh
index bcd04a9f..2e7d37a5 100644
--- a/default-package-config.sh
+++ b/default-package-config.sh
@@ -413,7 +413,7 @@ function kernel_merge_with_upstream() {
 	logmust git checkout -q -b repo-HEAD upstream-HEAD
 
 	# shellcheck disable=SC2086
-	logmust git cherry-pick ${dlpx_patch_start}^..${dlpx_patch_end}
+	logmust git cherry-pick --allow-empty ${dlpx_patch_start}^..${dlpx_patch_end}
 
 	logmust touch "$WORKDIR/repo-updated"
 }