fix: solve dependency conflict

Longhorn: 12921

Signed-off-by: David Cheng <david.cheng@suse.com>

Author: davidcheng0922

go.mod

@@ -10,15 +10,9 @@ require (
 	github.com/longhorn/backupstore v0.0.0-20260502085909-21ee466f5a8a
 	github.com/longhorn/go-common-libs v0.0.0-20260502161928-1e84fa75a8f1
 	github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467
-<<<<<<< HEAD
 	github.com/longhorn/longhorn-engine v1.12.0-rc1.0.20260514055507-33e0c9c94743
-	github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260514112050-c9306c85100e
-	github.com/longhorn/types v0.0.0-20260513135851-499d5d1f4e79
-=======
-	github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f
-	github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91
+	github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260515052624-a07df50fb05a
 	github.com/longhorn/types v0.0.0-20260514154143-1dfb06f48eeb
->>>>>>> 1ecf693e (feat: support snapshot max count for v2)
 	github.com/sirupsen/logrus v1.9.4
 	github.com/urfave/cli v1.22.17
 	golang.org/x/sync v0.20.0

go.sum

@@ -154,17 +154,10 @@ github.com/longhorn/go-iscsi-helper v0.0.0-20260331100542-4c4c6f91525b h1:877AlP
 github.com/longhorn/go-iscsi-helper v0.0.0-20260331100542-4c4c6f91525b/go.mod h1:5obSKdWNPiFbFTzPWU09k9mGCSnpN9pgGoHQTUk7kYo=
 github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467 h1:qwlSBgqM4tRclTcVPHOukZVu4jQjM5BZVgUseiORSk0=
 github.com/longhorn/go-spdk-helper v0.6.2-0.20260514102642-789b2a1cb467/go.mod h1:ZxbMkGsbC2TpzuGLjn9yXXExolt8/F3dl/C8O9/Qa7s=
-<<<<<<< HEAD
 github.com/longhorn/longhorn-engine v1.12.0-rc1.0.20260514055507-33e0c9c94743 h1:qipUnGPoycKQTV4o8fldtADKeZB5wsr3MVxumLH8xQA=
 github.com/longhorn/longhorn-engine v1.12.0-rc1.0.20260514055507-33e0c9c94743/go.mod h1:ElF8baZykwtIhUy3bQmn2BWGPQ5Ctz1fNJV53ByIKbA=
-github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260514112050-c9306c85100e h1:kIwRHAdLcAEUyoiExqPnwaZXoESBV98pyuMIba63iqA=
-github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260514112050-c9306c85100e/go.mod h1:QKlI5z0NgG/L5tuzKcQlkUcnd4JXtm7GZKN+ir8Qj6s=
-=======
-github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f h1:R76xekZfQKZTJrWs74QD4YLhXTiGEEUJr5aEjKGoh3k=
-github.com/longhorn/longhorn-engine v1.12.0-dev-20260503.0.20260514055128-ec3f7dbb512f/go.mod h1:WGxRiCkfdUBxNymnS8BaNBB9HXTQjJqUquptuUtM9+o=
-github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91 h1:r+7KHgr5H33Mp6GEodYfGcj5ky7GT0LdVBDdcVyhwKQ=
-github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91/go.mod h1:QozLt4bqxOnl69J8/o+zbMc40iQHzKfVO1v7zmfW31w=
->>>>>>> 1ecf693e (feat: support snapshot max count for v2)
+github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260515052624-a07df50fb05a h1:+aUW0HlROJw6vcwKFCPZuMk9Il/42Vi7oGNI7p8j78c=
+github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260515052624-a07df50fb05a/go.mod h1:VrfM/Lw54QdrjNs1uTKuGDqg87NdLh9v/OupX//f9tc=
 github.com/longhorn/sparse-tools v0.0.0-20260423074222-280e61de741a h1:xb71oeVPI7XZymAAG8ts5deC8s40dnX5IgxTYAB/qnk=
 github.com/longhorn/sparse-tools v0.0.0-20260423074222-280e61de741a/go.mod h1:d8l9nyC8No3PIfYHwZunnBj88y5M4sDM+h6uZyTtaNk=
 github.com/longhorn/types v0.0.0-20260514154143-1dfb06f48eeb h1:kj/ag7xC8l9QewJ6tpZAWCYRgipYwIOkqPoqY52utW4=

vendor/modules.txt

@@ -383,13 +383,8 @@ github.com/longhorn/longhorn-engine/pkg/sync
 github.com/longhorn/longhorn-engine/pkg/types
 github.com/longhorn/longhorn-engine/pkg/util
 github.com/longhorn/longhorn-engine/pkg/util/disk
-<<<<<<< HEAD
-# github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260514112050-c9306c85100e
+# github.com/longhorn/longhorn-spdk-engine v1.12.0-rc2.0.20260515052624-a07df50fb05a
 ## explicit; go 1.25.3
-=======
-# github.com/longhorn/longhorn-spdk-engine v0.0.0-20260515051212-7e0ddb934b91
-## explicit; go 1.26.0
->>>>>>> 1ecf693e (feat: support snapshot max count for v2)
 github.com/longhorn/longhorn-spdk-engine/pkg/api
 github.com/longhorn/longhorn-spdk-engine/pkg/client
 github.com/longhorn/longhorn-spdk-engine/pkg/log