Merge branch 'usb-dev' into queued_work

cgminer.c

@@ -3010,6 +3010,8 @@ void __copy_work(struct work *work, struct work *base_work)
 		work->nonce2 = strdup(base_work->nonce2);
 	if (base_work->ntime)
 		work->ntime = strdup(base_work->ntime);
+	if (base_work->sessionid)
+		work->sessionid = strdup(base_work->sessionid);
 	if (base_work->gbt_coinbase)
 		work->gbt_coinbase = strdup(base_work->gbt_coinbase);
 }

util.c

@@ -1517,7 +1517,7 @@ bool initiate_stratum(struct pool *pool)
 	if (pool->sessionid)
 		applog(LOG_DEBUG, "Pool %d stratum session id: %s", pool->pool_no, pool->sessionid);
 	else
-		applog(LOG_DEBUG, "Pool %d stratum session id does not exist");
+		applog(LOG_DEBUG, "Pool %d stratum session id does not exist", pool->pool_no);
 
 	ret = true;
 out: