From f1f11fd9cc78f5c449b63ccd56ee16668de9d6bf Mon Sep 17 00:00:00 2001
From: datacore-rm <raghunath.m@datacore.com>
Date: Tue, 27 Feb 2024 14:42:36 +0530
Subject: [PATCH] SSV-23250: Resolve merge conflicts.

---
 module/zfs/dsl_pool.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/module/zfs/dsl_pool.c b/module/zfs/dsl_pool.c
index ca0b10badf0c..a8f83e1a8b3c 100644
--- a/module/zfs/dsl_pool.c
+++ b/module/zfs/dsl_pool.c
@@ -135,14 +135,6 @@ int zfs_delay_min_dirty_percent = 60;
 unsigned long zfs_delay_scale = 1000 * 1000 * 1000 / 2000;
 
 /*
-<<<<<<< HEAD
- * This determines the number of threads used by the dp_sync_taskq.
- */
-int zfs_sync_taskq_batch_pct = 75;
-
-/*
-=======
->>>>>>> 85a589016 (Improve ZFS objset sync parallelism)
  * These tunables determine the behavior of how zil_itxg_clean() is
  * called via zil_clean() in the context of spa_sync(). When an itxg
  * list needs to be cleaned, TQ_NOSLEEP will be used when dispatching.