 +	LDFLAGS="-L$CGMINER_SDK/lib/$target $LDFLAGS"
 +fi
 +
+=======
+-m4_define([v_mic], [0])
++m4_define([v_mic], [3])
+ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+ m4_define([v_ver], [v_maj.v_min.v_mic])
+ m4_define([lt_rev], m4_eval(v_maj + v_min))
+@@ -106,13 +106,6 @@ case $target in
+ 	;;
+ esac
+ 
+-have_cgminer_sdk=false
+-if test -n "$CGMINER_SDK"; then
+-	have_cgminer_sdk=true
+-	CPPFLAGS="-I$CGMINER_SDK/include $CPPFLAGS"
+-	LDFLAGS="-L$CGMINER_SDK/lib/$target $LDFLAGS"
+-fi
+-
+>>>>>>> Stashed changes
  has_winpthread=false
  if test "x$have_win32" = xtrue; then
          has_winpthread=true
 diff --git a/driver-SPI-bitmine-A1.c b/driver-SPI-bitmine-A1.c
+<<<<<<< Updated upstream
 index 2ac50db..8ba4a6e 100644
 --- a/driver-SPI-bitmine-A1.c
 +++ b/driver-SPI-bitmine-A1.c

 
-		suspend_stratum(pool);
-
 		goto out;
 	}
 

-	if ((&itransfer->list)->next)
-		list_del(&itransfer->list);
+	list_del(&itransfer->list);
=======
index f488478..55b17f1 100644
--- a/compat/libusb-1.0/libusb/io.c
+++ b/compat/libusb-1.0/libusb/io.c
@@ -1478,7 +1478,10 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
 	 * the shortest timeout. */
 
 	usbi_mutex_lock(&ctx->flying_transfers_lock);
-	list_del(&itransfer->list);
+	/* FIXME: Sanity check for some race where this entry has already been
+	 * removed! */
+	if ((&itransfer->list)->next)
+		list_del(&itransfer->list);
>>>>>>> Stashed changes
 	if (usbi_using_timerfd(ctx)) {
 		r = arm_timerfd_for_next_timeout(ctx);
 		if (0 == r)
diff --git a/configure.ac b/configure.ac
<<<<<<< Updated upstream
index 20c41bd..5d6bb3b 100644
=======
index 5d6bb3b..20c41bd 100644
>>>>>>> Stashed changes
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [4])
 m4_define([v_min], [3])
<<<<<<< Updated upstream
-m4_define([v_mic], [3])
+m4_define([v_mic], [0])
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
