From cc71b3c16b5be922780fb0799801429a8b953158 Mon Sep 17 00:00:00 2001
From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
Date: Wed, 30 Aug 2023 10:52:41 +0600
Subject: [PATCH] fix for aarch64 on 6.1

Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
---
 lib/libspl/include/assert.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
index a5927c9cb6e2..6380686c5124 100644
--- a/lib/libspl/include/assert.h
+++ b/lib/libspl/include/assert.h
@@ -160,7 +160,6 @@ do {									\
 		    "%s == 0 (0x%llx == 0)", #LEFT,			\
 		    (u_longlong_t)__left);				\
 } while (0)
-<<<<<<< HEAD
 
 #define	VERIFY0P(LEFT)							\
 do {									\
@@ -170,10 +169,8 @@ do {									\
 		    "%s == 0 (%p == 0)", #LEFT,				\
 		    (void *)__left);					\
 } while (0)
-
-=======
 #endif
->>>>>>> 64ff1e384 (disable debug bloat)
+
 #ifdef assert
 #undef assert
 #endif